new views2.py with Thomas (MN) suggested changes included