Switch to new command system