Update to play nice with the new header design