diff --git a/src/main_perkons.cc b/src/main_perkons.cc
index decbf06..f88e14c 100644
--- a/src/main_perkons.cc
+++ b/src/main_perkons.cc
@@ -25,10 +25,10 @@ namespace Heck {
     static ld::MidiUartHandler midi{};
     static ld::FIFO<ld::MidiEvent, 128> event_log{};
 
-    Instrument::Grainlet instrument0{};
-    Instrument::FM instrument1{};
+    Instrument::FM instrument0{};
+    Instrument::Grainlet instrument1{};
     Instrument::FM instrument2{};
-    Instrument::Kick instrument3{};
+    Instrument::Grainlet instrument3{};
 
     std::array<Track, Constants::TRACK_COUNT> tracks;
 
@@ -306,13 +306,13 @@ namespace Heck {
                         tracks[cc.channel].instrument->ctl(0, val_normalized);
                         break;
                     case Constants::MIDI_Mapping::TRACK_DECAY:
-                        tracks[cc.channel].instrument->ctl(1, val_normalized);
+                        tracks[cc.channel].decay(val_normalized);
                         break;
                     case Constants::MIDI_Mapping::TRACK_PARAM1:
                         tracks[cc.channel].instrument->ctl(2, val_normalized);
                         break;
                     case Constants::MIDI_Mapping::TRACK_PARAM2:
-                        tracks[cc.channel].decay(val_normalized);
+                        tracks[cc.channel].instrument->ctl(3,val_normalized);
                         break;
                     case Constants::MIDI_Mapping::TRACK_FILTER:
                         tracks[cc.channel].filter(val_normalized);