updated model and view