Added instrument switch statements