Even more instrumentation