Made Switches harder