updated for WS235