Half-way instrumentation changes