Updated views
Updated manager