Reorg and relevant changes