Switch to standard command system