more setup reorg