A bunch of changes before testing StrinInstrument