reorg some more