Added ability to evaluate function
Changes to instrumentation code