updates to views
merge