Improve transition