Updated to work with SWS Servers