update based on nolans comments