Tinkering with the headers some more