fixed transitions to work much cleaner