GG changes, add 6 views, remove extra