edits with Michael's feedback