Grammar changes from @stephanieosan