Add track_scores and min_score