Update Harts code for evaluate()