Improvements to the Evaluation system