changes to Solver