updates from Nathan's feedback #2