WCM with reengineered solver