updated model and views