more edits, v1