header optimization changes