cleaned up view 1