Transitions improvements