Tried varying the matching algorithm a bit