Brings the header mostly inline with CLM