cleaned up some of the transition