Reverted back to old header code