Change to not say token name again on matches