Make some more changes to the model.py