ok, just updated other parts. Let's wait for Etienne's input.