Big update for find_train.