Evaluator minor changes
Commit after a merge
.
.