Reengineered WCM_solvers