Changed Evaluation a bit