BasicEvaluator improvements (heuristic)