better token match