removed separated command validated; relocated to inside of switch