Added Roundy's changes to solve.py