Improve transitions