merged mike wording changes