#7: Improved Solver.