incorporated Tobie's feedback