Incorporate wording changes from Evan Owens