Update

Reenabled instrumentation, and changed the callback, of method returns.