cleaned up view 3