minor shuffling around of headers