re-jigger the headers