updated views and models