Middle of some header changes