Simplified state transition and added fade from state to state
One other thing too