Re-added match counting