ugly manual instrumentation of all of my changes