edits through end of section 2.6