done in view 2