refucktored view 2