Some additions, but we need to solve this view2view issue