new WS refactoring.
fixes