Improved number matching