Edits up to section 5