[Ssr2-review] Edits