Modified ChangeStates -> Push and Pop