more work on evaluator