more shuffling of commands around