integrating kate's feedback