Update solver.R