Updated to views and models