bring back some instrumentation