rearranged commands, removed <CR>