big structure changes
new view names