Merge Antoine's work