changed order of commands