Change differents thinks thanks to Matthieu comments