PATCH 2/3 and PATCH 3/3 also seem good to me. Greetings, Maxime.