Refactored Evaluation.