added views and removed dupes