Evaluation heavily corrected

Evaluation heavily corrected