Updated per your suggestion.