Updated views
Updated code