Organized functions based on header changes.