Readjusted more of the headers