reorg, edits