Some changes , need gestion erreurs partout