Move commands around logically