Rearranged headers so they make more sense.