lot of updates on evaluation engine