WS changes