model and views edited