Added cheap instrumentation