Updated per Doug's comments (2)