Updated per Larry's comments.