Final update of Models and Views.py