slight reorg of content