Revise Solver.v