merge
modified the architecture + TP 3 5 or more almost done : need to check why the token don't remove them