Trying to improve evaluator.