Better instrumentation, limit probe size