OCD reorder of commands