updated to new WS updates