Make changes according to Pierre's suggestions