evaluator refactoring done. x6 speed up.