Partially added the view 2 implermentaion