reorg for clarity