updated to new WS conventions