updates to latests WS changes