rework wrap headers