Improved SwitchWS