add more instrumentation