Changes per Peter's feedback