Making Instrument Replacer more powerful