a little more reorg