Address Patrick's feedback