edits on Kevin's feedback