cleaned up some of the transitions