more WS changes