Improved matcher.