Headers overhaul