Updated Evaluation Framework (2)