Better instrumenting