wsserver changes