more changes on the solver
fixed merge