Use new header locations everywhere