added more instrumenting