Updates from Janet's feedback.