updates, still working on instrumentation