Rework the header #148