Transitions reworked