Make changes according to Arnaud's comments