added two new views
merge