WS as per PR review