Improvements on transitions