updated models and views