MatchTracks now uses TrackSet