Take into account Pierrick's review.
WIP
Draft version.