Added and improved on transitions