Modified switch case