updates from Nathan's feedback #3