Instrumentation improvements