refactor view 1