WS: analytic changes and training