merging changes into views.py