Maybe yes, but i think we should refactor the transition methods anyway.