Integrate Gérauds comments.