hack in some instrumentation