Refactored view1