Some more changes to that header