added new MatchFinder implementation, backuping the old one