minor revision per Nathan's comments