More work on evaluator...