updated demoInstruments to use class factories