revision architecture + ajout coms
fix conflicts