Modification following Jérôme comments