#610: Edits