refactor view 2