Try re-writing all the headers

Tweak content