more conversion to Attributes, and header updates