incorporating rhall's feedback