Reworked headers to H2