And more edits