some reorg prep for v3