Changed Flow of Commands!