edited the models and views