Added content to evaluation
Merged conflicts