fix and reorg