updated calls to best_match