temporary approach to handling bpwatch instrumentation