remove transition
refactor diago calcul