Solver updated