Implemented Erwan's feedback