some reorg that makes more sense. addn updates