Some more instrumentation