updated views
merged