Change the matching algorithm for a faster one