Minor improvement
Added evaluation code