Added parts of evaluation