updates for instrumentation, need to cleanup the code quite a bit at this point
updates