Decrease some noise. Added more instrumentation