Improved Evaluation

Changes made