first WS changes