reorg a bit better to help support potential parallel