Here's the v2. Thanks, Mathieu