changes to evaluation code