Changes to Switch