some changes in models, and views