More work on evaluator