integration of Simone comments