some early header changes.