             conductor.core.detune = value
             
         case ControlTag.OscMix.rawValue:
-<<<<<<< HEAD
             statusLabel.text = "OscMix: \(value.decimalString)"
-            conductor.core.vco12Mix = value
+            conductor.core.vcoBalance = value
             
         case ControlTag.Pwm.rawValue:
-            statusLabel.text = "Pulse Width: \(value.decimalString)"
-            conductor.core.pulseWidth = value
-=======
-            statusLabel.text = "OscMix: \(value.decimalFormattedString)"
-            conductor.core.vcoBalance = value
-            
-        case ControlTag.Pwm.rawValue:
-            statusLabel.text = "Morph: \(value.decimalFormattedString)"
+            statusLabel.text = "Morph: \(value.decimalString)"
             conductor.core.morph = value
->>>>>>> 2ae253aba079d102fd58ee79ae4585bc9284d516
             
         // Additional OSCs
         case ControlTag.SubMix.rawValue:

        
        masterVolKnob.maximum = 30.0
        masterVolKnob.value = conductor.masterVolume.volume
        
<<<<<<< HEAD
=======
        // Set toggle switches (Start simple)
        vco1Toggled(vco1Toggle)
      
>>>>>>> 2ae253aba079d102fd58ee79ae4585bc9284d516
    }

    //*****************************************************************

        fmMixKnob.value = conductor.core.fmOscMix
        
        fmModKnob.maximum = 15

        pwmKnob.value = conductor.core.morph
        pwmKnob.minimum = -0.99
