changed views, models, added some methods