Update to solver.c