Last push before inproving the solver