Update via Ryan's feedback