Further work towards the header