Refactored for Instrument change