add ProbeMatches and ResolveMatches