Rearranged some commands.