Added headings, changed structure