Working on the solver