Edits per Shai's feedback.