Added the command switch statement