Small Changes to Evaluation Engine