incorporated Kristien's feedback