> This is not what we have agreed. Could you, pls, rework?

Oops wrong rebase, sorry about that. Here's an update version.

Mathieu