Header re-work / version