almost there for new header solution