Modified moels.py