re-combobulated view 2