updated to remove char driven headers