Updated with working views