Added OP switch case