changed solver.py