Header changes take two