Merge code Quentin and Guillaume