improved instrumentation