added Andy's feedback