change way commands are parsed