Edits, sections 1 and 2.