some header reorg