handle header better