updated views
merge master