changes in Solver interface