Added break; and new switch cases