Fix me up view 2