cleaned up view 2