my changes for reorg