better WS stuff