added new flexible instrumentation stuff