Evaluation procedure enhanced