rebuilt, fixed headings