my updated models and views