Solver changes