Evaluation Engine Updated