Updated instrumentation