edited views to use new tables