Header rework