target: header reshuffle, part2