updated to add instrumentation