17.12 Edits round 2