Updated views
merge
merge