Instrumentation for Better Demonstrations: A Case Study