headers rework