views and models changed a bit