first section, and some second section edits