Updated with views