Corrected ordering of commands WIP