few more view2 changes