Reverted changes to Switch statements