Headings was refactored