Final changes to header part