different header handling

untested :O