Even more instrumentation around shib