changed header handling