Edits up to section 3.2