little reorg while switching machines