local changes to get evaluation running