reorg and more copy