Update according to Henry's feedback