Added stuff for evaluation