Improving the solver