changes in Solver
.