diff --git a/src/fx_chorus.cpp b/src/fx_chorus.cpp
index ff392e4..edfa683 100644
--- a/src/fx_chorus.cpp
+++ b/src/fx_chorus.cpp
@@ -9,7 +9,7 @@
 
 Chorus::Chorus(float32_t sampling_rate) :
     FXElement(sampling_rate),
-    engine_(sampling_rate, 0.0f, 0.0f),
+    engine_(sampling_rate, 0.0f),
     rate_(0.0f),
     depth_(0.0f),
     fullscale_depth_(0.0f),
diff --git a/src/fx_engine.hpp b/src/fx_engine.hpp
index 93cdabe..2688bd1 100644
--- a/src/fx_engine.hpp
+++ b/src/fx_engine.hpp
@@ -120,11 +120,11 @@ public:
         kLFOCount
     };
 
-    FxEngine(float32_t sampling_rate, float32_t max_lfo1_frequency = 1.0f, float32_t max_lfo2_frequency = 1.0f) :
+    FxEngine(float32_t sampling_rate, float32_t max_lfo_frequency = 20.0f) :
         FXBase(sampling_rate)
     {
         this->buffer_ = new T[size];
-        for(unsigned i = 0; i < LFOIndex::kLFOCount; ++i) this->lfo_[i] = enable_lfo ? new LFO(sampling_rate, 0.0f, max_lfo1_frequency) : nullptr;
+        for(unsigned i = 0; i < LFOIndex::kLFOCount; ++i) this->lfo_[i] = enable_lfo ? new LFO(sampling_rate, 0.0f, max_lfo_frequency) : nullptr;
         this->clear();
     }
 
diff --git a/src/fx_orbitone.cpp b/src/fx_orbitone.cpp
index b94b9c9..0263a0d 100644
--- a/src/fx_orbitone.cpp
+++ b/src/fx_orbitone.cpp
@@ -9,7 +9,7 @@
 
 Orbitone::Orbitone(float32_t sampling_rate, float32_t rate, float32_t depth) : 
     FXElement(sampling_rate),
-    engine_(sampling_rate, 0.0f, 0.0f),
+    engine_(sampling_rate, 0.0f),
     depth_(0.0f),
     fullscale_depth_(0.0f)
 {
diff --git a/src/minidexed.h b/src/minidexed.h
index f09c198..11d7305 100644
--- a/src/minidexed.h
+++ b/src/minidexed.h
@@ -46,7 +46,7 @@
 #include "effect_compressor.h"
 
 #ifdef MIXING_CONSOLE_ENABLE
-#include "mixing_console.h"
+#include "mixing_console.hpp"
 
 typedef MixingConsole<CConfig::ToneGenerators> Mixer;
 #endif
diff --git a/src/mixing_console.cpp b/src/mixing_console.cpp
deleted file mode 100644
index 62993b8..0000000
--- a/src/mixing_console.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-//
-// mixing_console.hpp
-//
-// MiniDexed - Dexed FM synthesizer for bare metal Raspberry Pi
-// Copyright (C) 2022  The MiniDexed Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-// Implementation of the MixingConsole class defined in mixing_console.h
-
-#include "mixing_console.h"
-
-template<size_t nb_inputs>
-MixingConsole<nb_inputs>::MixingConsole(float32_t sampling_rate, size_t buffer_size) :
-    FXBase(sampling_rate),
-    BufferSize(buffer_size)
-{
-    for(size_t i = 0; i < nb_inputs; ++i)
-    {
-        this->input_sample_buffer_[StereoChannels::Left ][i] = new float32_t[this->BufferSize];
-        this->input_sample_buffer_[StereoChannels::Right][i] = new float32_t[this->BufferSize];
-        memset(this->input_sample_buffer_[StereoChannels::Left ][i], 0, this->BufferSize);
-        memset(this->input_sample_buffer_[StereoChannels::Right][i], 0, this->BufferSize);
-    }
-
-    memset(this->fx_, 0, MixerOutput::kFXCount * sizeof(FXElement*));
-
-    this->fx_[MixerOutput::FX_Tube] = this->tube_ = new FXUnit2<Tube>(sampling_rate);
-    this->fx_[MixerOutput::FX_Chorus] = this->chorus_ = new FXUnit2<Chorus>(sampling_rate);
-    this->fx_[MixerOutput::FX_Flanger] = this->flanger_ = new FXUnit2<Flanger>(sampling_rate);
-    this->fx_[MixerOutput::FX_Orbitone] = this->orbitone_ = new FXUnit2<Orbitone>(sampling_rate);
-    this->fx_[MixerOutput::FX_Phaser] = this->phaser_ = new FXUnit2<Phaser>(sampling_rate);
-    this->fx_[MixerOutput::FX_Delay] = this->delay_  = new FXUnit2<Delay>(sampling_rate);
-    this->fx_[MixerOutput::FX_PlateReverb] = this->plate_reverb_ = new FXUnit2<AudioEffectPlateReverb>(sampling_rate);
-    this->fx_[MixerOutput::FX_ShimmerReverb] = this->shimmer_reverb_ = new FXUnit2<ShimmerReverb>(sampling_rate);
-    this->fx_[MixerOutput::MainOutput] = this->dry_ = new FXUnit2<Dry>(sampling_rate);
-
-    this->init();
-}
-
-template<size_t nb_inputs>
-MixingConsole<nb_inputs>::~MixingConsole()
-{
-    for(size_t i = 0; i < nb_inputs; ++i)
-    {
-        delete this->input_sample_buffer_[StereoChannels::Left ][i];
-        delete this->input_sample_buffer_[StereoChannels::Right][i];
-    }
-
-    for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
-    {
-        delete this->fx_[i];
-    }
-}
-
-// Send section
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setChannelLevel(size_t in, float32_t lvl)
-{
-    assert(in < nb_inputs);
-
-    lvl = constrain(lvl, 0.0f, 1.0f);
-    if(lvl == this->channel_level_[in]) return;
-
-    this->channel_level_[in] = lvl;
-    this->updatePan();
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setPan(size_t in, float32_t pan)
-{
-    assert(in < nb_inputs);
-
-    pan = constrain(pan, 0.0f, 1.0f);
-    
-    if(pan == this->pan_[StereoChannels::kNumChannels][in]) return;
-
-    this->pan_[StereoChannels::kNumChannels][in] = pan;
-    this->updatePan(in);
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::updatePan(size_t in)
-{
-    float32_t pan = mapfloat(this->pan_[StereoChannels::kNumChannels][in], 0.0f, 1.0f, 0.0, Constants::MPI_2);
-    this->pan_[StereoChannels::Left ][in] = arm_sin_f32(pan) * this->channel_level_[in];
-    this->pan_[StereoChannels::Right][in] = arm_cos_f32(pan) * this->channel_level_[in];
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setSendLevel(size_t in, MixerOutput fx, float32_t lvl)
-{
-    assert(in < nb_inputs);
-    assert(fx < kFXCount);
-
-    this->setLevel(in, fx, lvl);
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setInputSample(size_t in, float32_t sampleL, float32_t sampleR)
-{
-    assert(in < nb_inputs);
-
-    this->setSample(in, sampleL, sampleR);
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setInputSampleBuffer(size_t in, float32_t* samples)
-{
-    assert(in < nb_inputs);
-
-    if(samples != nullptr)
-    {
-        arm_scale_f32(samples, this->pan_[StereoChannels::Left ][in], this->input_sample_buffer_[StereoChannels::Left ][in], this->BufferSize);
-        arm_scale_f32(samples, this->pan_[StereoChannels::Right][in], this->input_sample_buffer_[StereoChannels::Right][in], this->BufferSize);
-    }
-    else
-    {
-        memset(this->input_sample_buffer_[StereoChannels::Left ][in], 0, this->BufferSize * sizeof(float32_t));
-        memset(this->input_sample_buffer_[StereoChannels::Right][in], 0, this->BufferSize * sizeof(float32_t));
-    }
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setInputSampleBuffer(size_t in, float32_t* samplesL, float32_t* samplesR)
-{
-    assert(in < nb_inputs);
-    if(samplesL != nullptr)
-    {
-        memcpy(this->input_sample_buffer_[StereoChannels::Left ][in], samplesL, this->BufferSize * sizeof(float32_t));
-    }
-    else
-    {
-        memset(this->input_sample_buffer_[StereoChannels::Left ][in], 0, this->BufferSize * sizeof(float32_t));
-    }
-
-    if(samplesR != nullptr)
-    {
-        memcpy(this->input_sample_buffer_[StereoChannels::Right][in], samplesR, this->BufferSize * sizeof(float32_t));
-    }
-    else
-    {
-        memset(this->input_sample_buffer_[StereoChannels::Right][in], 0, this->BufferSize * sizeof(float32_t));
-    }
-}
-
-// Return section
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setReturnLevel(MixerOutput ret, MixerOutput dest, float32_t lvl)
-{
-    assert(ret < (kFXCount - 1));
-    assert(dest < kFXCount);
-
-    if(ret == dest)
-    {
-        // An FX cannot feedback on itself
-        return;
-    }
-
-    this->setLevel(nb_inputs + ret, dest, lvl);
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setReturnSample(MixerOutput ret, float32_t sampleL, float32_t sampleR)
-{
-    assert(ret < (kFXCount - 1));
-
-    this->setSample(nb_inputs + ret, sampleL, sampleR);
-}
-
-// Global section
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setLevel(size_t in, MixerOutput fx, float32_t lvl)
-{
-    assert(in < (nb_inputs + MixerOutput::kFXCount - 1));
-    assert(fx < MixerOutput::kFXCount);
-
-    this->levels_[fx][in] = constrain(lvl, 0.0f, 1.0f);
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::setSample(size_t in, float32_t sampleL, float32_t sampleR)
-{
-    assert(in < (nb_inputs + MixerOutput::kFXCount - 1));
-    this->input_samples_[StereoChannels::Left ][in] = sampleL;
-    this->input_samples_[StereoChannels::Right][in] = sampleR;
-}
-
-// Get FX
-template<size_t nb_inputs>
-FXElement* MixingConsole<nb_inputs>::getFX(size_t fx)
-{
-    assert(fx < MixerOutput::kFXCount);
-    return this->fx_[fx];
-}
-
-template<size_t nb_inputs>
-FXUnit2<Tube>* MixingConsole<nb_inputs>::getTube()
-{
-    return this->tube_;
-}
-
-template<size_t nb_inputs>
-FXUnit2<Chorus>* MixingConsole<nb_inputs>::getChorus()
-{
-    return this->chorus_;
-}
-
-template<size_t nb_inputs>
-FXUnit2<Flanger>* MixingConsole<nb_inputs>::getFlanger()
-{
-    return this->flanger_;
-}
-
-template<size_t nb_inputs>
-FXUnit2<Orbitone>* MixingConsole<nb_inputs>::getOrbitone()
-{
-    return this->orbitone_;
-}
-
-template<size_t nb_inputs>
-FXUnit2<Phaser>* MixingConsole<nb_inputs>::getPhaser()
-{
-    return this->phaser_;
-}
-
-template<size_t nb_inputs>
-FXUnit2<Delay>* MixingConsole<nb_inputs>::getDelay()
-{
-    return this->delay_;
-}
-
-template<size_t nb_inputs>
-FXUnit2<AudioEffectPlateReverb>* MixingConsole<nb_inputs>::getPlateReverb()
-{
-    return this->plate_reverb_;
-}
-
-template<size_t nb_inputs>
-FXUnit2<ShimmerReverb>* MixingConsole<nb_inputs>::getShimmerReverb()
-{
-    return this->shimmer_reverb_;
-}
-
-template<size_t nb_inputs>
-FXUnit2<Dry>* MixingConsole<nb_inputs>::getDry()
-{
-    return this->dry_;
-}
-
-// Processing
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::init()
-{
-    for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
-        memset(this->levels_[i], 0, (nb_inputs + MixerOutput::kFXCount - 1) * sizeof(float32_t));
-    
-    for(size_t i = 0; i < StereoChannels::kNumChannels; ++i) 
-        memset(this->input_samples_[i], 0, (nb_inputs + MixerOutput::kFXCount - 1) * sizeof(float32_t));
-
-    this->reset();
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::reset()
-{
-    for(size_t i = 0; i < nb_inputs; ++i)
-    {
-        memset(this->input_sample_buffer_[StereoChannels::Left ][i], 0, this->BufferSize);
-        memset(this->input_sample_buffer_[StereoChannels::Right][i], 0, this->BufferSize);
-    }
-
-    for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
-    {
-        this->fx_[i]->reset();
-    }
-
-    for(size_t i = 0; i < MixerOutput::MainOutput; ++i)
-    {
-        this->setReturnSample(static_cast<MixerOutput>(i), 0.0f, 0.0f);
-    }
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::processSample(float32_t& outL, float32_t& outR)
-{
-    float32_t fx_inputs_[MixerOutput::kFXCount][StereoChannels::kNumChannels];
-    float32_t fx_outputs_[MixerOutput::kFXCount][StereoChannels::kNumChannels];
-
-    for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
-    {
-        // Compute the samples that will feed the MixerOutput and process MixerOutput
-        fx_inputs_[i][StereoChannels::Left ] = arm_weighted_sum_f32(this->input_samples_[StereoChannels::Left ], this->levels_[i], nb_inputs + MixerOutput::kFXCount - 1);
-        fx_inputs_[i][StereoChannels::Right] = arm_weighted_sum_f32(this->input_samples_[StereoChannels::Right], this->levels_[i], nb_inputs + MixerOutput::kFXCount - 1);
-
-        // Process the FX
-        this->fx_[i]->processSample(
-            fx_inputs_[i][StereoChannels::Left],
-            fx_inputs_[i][StereoChannels::Right],
-            fx_outputs_[i][StereoChannels::Left],
-            fx_outputs_[i][StereoChannels::Right]
-        );
-
-        if(i != MixerOutput::MainOutput)
-        {
-            // Feedback the resulting samples except for the main output
-            this->setReturnSample(
-                static_cast<MixerOutput>(i), 
-                fx_outputs_[i][StereoChannels::Left],
-                fx_outputs_[i][StereoChannels::Right]
-            );
-        }
-    }
-
-    // Return this main output sample
-    outL = fx_inputs_[MixerOutput::MainOutput][StereoChannels::Left];
-    outR = fx_inputs_[MixerOutput::MainOutput][StereoChannels::Right];
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::prepare()
-{
-    for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
-    {
-        this->fx_[i]->prepare();
-    }
-}
-
-template<size_t nb_inputs>
-void MixingConsole<nb_inputs>::process(float32_t* outL, float32_t* outR)
-{
-    this->prepare();
-
-    for(size_t s = 0; s < this->BufferSize; ++s)
-    {
-        for(size_t in = 0; in < nb_inputs; ++in)
-        {
-            this->setSample(
-                in, 
-                this->input_sample_buffer_[StereoChannels::Left ][in][s], 
-                this->input_sample_buffer_[StereoChannels::Right][in][s]
-            );
-        }
-
-        this->processSample(*outL, *outR);
-        ++outL;
-        ++outR;
-    }
-}
\ No newline at end of file
diff --git a/src/mixing_console.h b/src/mixing_console.h
deleted file mode 100644
index deef85f..0000000
--- a/src/mixing_console.h
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// mixing_console.h
-//
-// MiniDexed - Dexed FM synthesizer for bare metal Raspberry Pi
-// Copyright (C) 2022  The MiniDexed Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-#pragma once
-
-#include "mixing_console_constants.h"
-#include "fx.h"
-#include "fx_tube.h"
-#include "fx_chorus.h"
-#include "fx_flanger.h"
-#include "fx_orbitone.h"
-#include "fx_phaser.h"
-#include "fx_delay.h"
-#include "effect_platervbstereo.h"
-#include "fx_shimmer_reverb.h"
-#include "fx_dry.h"
-#include "fx_unit2.hpp"
-
-template<size_t nb_inputs = 8>
-class MixingConsole : public FXBase
-{
-    DISALLOW_COPY_AND_ASSIGN(MixingConsole);
-
-public:
-    MixingConsole(float32_t sampling_rate, size_t buffer_size);
-    ~MixingConsole();
-
-    void setChannelLevel(size_t in, float32_t lvl);
-    void setPan(size_t in, float32_t pan);
-    void setSendLevel(size_t in, MixerOutput fx, float32_t lvl);
-    void setInputSample(size_t in, float32_t sampleL, float32_t sampleR);
-    void setInputSampleBuffer(size_t in, float32_t* samples);
-    void setInputSampleBuffer(size_t in, float32_t* samplesL, float32_t* samplesR);
-
-    void setReturnLevel(MixerOutput ret, MixerOutput dest, float32_t lvl);
-    void setReturnSample(MixerOutput ret, float32_t _sampleL, float32_t _sampleR);
-
-    FXElement* getFX(size_t fx);
-    FXUnit2<Tube>* getTube();
-    FXUnit2<Chorus>* getChorus();
-    FXUnit2<Flanger>* getFlanger();
-    FXUnit2<Orbitone>* getOrbitone();
-    FXUnit2<Phaser>* getPhaser();
-    FXUnit2<Delay>* getDelay();
-    FXUnit2<AudioEffectPlateReverb>* getPlateReverb();
-    FXUnit2<ShimmerReverb>* getShimmerReverb();
-    FXUnit2<Dry>* getDry();
-
-    void init();
-    virtual void reset() override;
-    virtual void prepare() override;
-    void processSample(float32_t& outL, float32_t& outR);
-    void process(float32_t* outL, float32_t* outR);
-
-protected:
-    void updatePan(size_t in);
-    void setLevel(size_t in, MixerOutput fx, float32_t lvl);
-    void setSample(size_t in, float32_t sampleL, float32_t sampleR);
-
-private:
-    const size_t BufferSize;
-
-    float32_t channel_level_[nb_inputs];
-    float32_t pan_[StereoChannels::kNumChannels + 1][nb_inputs];
-    float32_t* input_sample_buffer_[StereoChannels::kNumChannels][nb_inputs];
-    float32_t input_samples_[StereoChannels::kNumChannels][nb_inputs + MixerOutput::kFXCount - 1];
-    float32_t levels_[MixerOutput::kFXCount][nb_inputs + MixerOutput::kFXCount - 1];
-
-    FXElement* fx_[MixerOutput::kFXCount];
-    FXUnit2<Tube>* tube_;
-    FXUnit2<Chorus>* chorus_;
-    FXUnit2<Flanger>* flanger_;
-    FXUnit2<Orbitone>* orbitone_;
-    FXUnit2<Phaser>* phaser_;
-    FXUnit2<Delay>* delay_;
-    FXUnit2<AudioEffectPlateReverb>* plate_reverb_;
-    FXUnit2<ShimmerReverb>* shimmer_reverb_;
-    FXUnit2<Dry>* dry_;
-};
-
-#include "mixing_console.cpp"
diff --git a/src/mixing_console.hpp b/src/mixing_console.hpp
new file mode 100644
index 0000000..c5e3be1
--- /dev/null
+++ b/src/mixing_console.hpp
@@ -0,0 +1,375 @@
+//
+// mixing_console.hpp
+//
+// MiniDexed - Dexed FM synthesizer for bare metal Raspberry Pi
+// Copyright (C) 2022  The MiniDexed Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+// Implementation of the MixingConsole class defined in mixing_console.h
+#pragma once
+
+#include "mixing_console_constants.h"
+#include "fx.h"
+#include "fx_tube.h"
+#include "fx_chorus.h"
+#include "fx_flanger.h"
+#include "fx_orbitone.h"
+#include "fx_phaser.h"
+#include "fx_delay.h"
+#include "effect_platervbstereo.h"
+#include "fx_shimmer_reverb.h"
+#include "fx_dry.h"
+#include "fx_unit2.hpp"
+
+template<size_t nb_inputs = 8>
+class MixingConsole : public FXBase
+{
+    DISALLOW_COPY_AND_ASSIGN(MixingConsole);
+
+public:
+    MixingConsole(float32_t sampling_rate, size_t buffer_size) :
+        FXBase(sampling_rate),
+        BufferSize(buffer_size)
+    {
+        for(size_t i = 0; i < nb_inputs; ++i)
+        {
+            this->input_sample_buffer_[StereoChannels::Left ][i] = new float32_t[this->BufferSize];
+            this->input_sample_buffer_[StereoChannels::Right][i] = new float32_t[this->BufferSize];
+            memset(this->input_sample_buffer_[StereoChannels::Left ][i], 0, this->BufferSize);
+            memset(this->input_sample_buffer_[StereoChannels::Right][i], 0, this->BufferSize);
+        }
+
+        memset(this->fx_, 0, MixerOutput::kFXCount * sizeof(FXElement*));
+
+        this->fx_[MixerOutput::FX_Tube] = this->tube_ = new FXUnit2<Tube>(sampling_rate);
+        this->fx_[MixerOutput::FX_Chorus] = this->chorus_ = new FXUnit2<Chorus>(sampling_rate);
+        this->fx_[MixerOutput::FX_Flanger] = this->flanger_ = new FXUnit2<Flanger>(sampling_rate);
+        this->fx_[MixerOutput::FX_Orbitone] = this->orbitone_ = new FXUnit2<Orbitone>(sampling_rate);
+        this->fx_[MixerOutput::FX_Phaser] = this->phaser_ = new FXUnit2<Phaser>(sampling_rate);
+        this->fx_[MixerOutput::FX_Delay] = this->delay_  = new FXUnit2<Delay>(sampling_rate);
+        this->fx_[MixerOutput::FX_PlateReverb] = this->plate_reverb_ = new FXUnit2<AudioEffectPlateReverb>(sampling_rate);
+        this->fx_[MixerOutput::FX_ShimmerReverb] = this->shimmer_reverb_ = new FXUnit2<ShimmerReverb>(sampling_rate);
+        this->fx_[MixerOutput::MainOutput] = this->dry_ = new FXUnit2<Dry>(sampling_rate);
+
+        this->init();
+    }
+
+    ~MixingConsole()
+    {
+        for(size_t i = 0; i < nb_inputs; ++i)
+        {
+            delete this->input_sample_buffer_[StereoChannels::Left ][i];
+            delete this->input_sample_buffer_[StereoChannels::Right][i];
+        }
+
+        for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
+        {
+            delete this->fx_[i];
+        }
+    }
+
+    // Send section
+
+    void setChannelLevel(size_t in, float32_t lvl)
+    {
+        assert(in < nb_inputs);
+
+        lvl = constrain(lvl, 0.0f, 1.0f);
+        if(lvl == this->channel_level_[in]) return;
+
+        this->channel_level_[in] = lvl;
+        this->updatePan();
+    }
+
+    void setPan(size_t in, float32_t pan)
+    {
+        assert(in < nb_inputs);
+
+        pan = constrain(pan, 0.0f, 1.0f);
+        
+        if(pan == this->pan_[StereoChannels::kNumChannels][in]) return;
+
+        this->pan_[StereoChannels::kNumChannels][in] = pan;
+        this->updatePan(in);
+    }
+
+    void setSendLevel(size_t in, MixerOutput fx, float32_t lvl)
+    {
+        assert(in < nb_inputs);
+        assert(fx < kFXCount);
+
+        this->setLevel(in, fx, lvl);
+    }
+
+    void setInputSample(size_t in, float32_t sampleL, float32_t sampleR)
+    {
+        assert(in < nb_inputs);
+
+        this->setSample(in, sampleL, sampleR);
+    }
+
+    void setInputSampleBuffer(size_t in, float32_t* samples)
+    {
+        assert(in < nb_inputs);
+
+        if(samples != nullptr)
+        {
+            arm_scale_f32(samples, this->pan_[StereoChannels::Left ][in], this->input_sample_buffer_[StereoChannels::Left ][in], this->BufferSize);
+            arm_scale_f32(samples, this->pan_[StereoChannels::Right][in], this->input_sample_buffer_[StereoChannels::Right][in], this->BufferSize);
+        }
+        else
+        {
+            memset(this->input_sample_buffer_[StereoChannels::Left ][in], 0, this->BufferSize * sizeof(float32_t));
+            memset(this->input_sample_buffer_[StereoChannels::Right][in], 0, this->BufferSize * sizeof(float32_t));
+        }
+    }
+
+    void setInputSampleBuffer(size_t in, float32_t* samplesL, float32_t* samplesR)
+    {
+        assert(in < nb_inputs);
+        if(samplesL != nullptr)
+        {
+            memcpy(this->input_sample_buffer_[StereoChannels::Left ][in], samplesL, this->BufferSize * sizeof(float32_t));
+        }
+        else
+        {
+            memset(this->input_sample_buffer_[StereoChannels::Left ][in], 0, this->BufferSize * sizeof(float32_t));
+        }
+
+        if(samplesR != nullptr)
+        {
+            memcpy(this->input_sample_buffer_[StereoChannels::Right][in], samplesR, this->BufferSize * sizeof(float32_t));
+        }
+        else
+        {
+            memset(this->input_sample_buffer_[StereoChannels::Right][in], 0, this->BufferSize * sizeof(float32_t));
+        }
+    }
+
+    // Return section
+
+    void setReturnLevel(MixerOutput ret, MixerOutput dest, float32_t lvl)
+    {
+        assert(ret < (kFXCount - 1));
+        assert(dest < kFXCount);
+
+        if(ret == dest)
+        {
+            // An FX cannot feedback on itself
+            return;
+        }
+
+        this->setLevel(nb_inputs + ret, dest, lvl);
+    }
+
+    void setReturnSample(MixerOutput ret, float32_t sampleL, float32_t sampleR)
+    {
+        assert(ret < (kFXCount - 1));
+
+        this->setSample(nb_inputs + ret, sampleL, sampleR);
+    }
+
+    // Get FX
+    FXElement* getFX(size_t fx)
+    {
+        assert(fx < MixerOutput::kFXCount);
+        return this->fx_[fx];
+    }
+
+    FXUnit2<Tube>* getTube()
+    {
+        return this->tube_;
+    }
+
+    FXUnit2<Chorus>* getChorus()
+    {
+        return this->chorus_;
+    }
+
+    FXUnit2<Flanger>* getFlanger()
+    {
+        return this->flanger_;
+    }
+
+    FXUnit2<Orbitone>* getOrbitone()
+    {
+        return this->orbitone_;
+    }
+
+    FXUnit2<Phaser>* getPhaser()
+    {
+        return this->phaser_;
+    }
+
+    FXUnit2<Delay>* getDelay()
+    {
+        return this->delay_;
+    }
+
+    FXUnit2<AudioEffectPlateReverb>* getPlateReverb()
+    {
+        return this->plate_reverb_;
+    }
+
+    FXUnit2<ShimmerReverb>* getShimmerReverb()
+    {
+        return this->shimmer_reverb_;
+    }
+
+    FXUnit2<Dry>* getDry()
+    {
+        return this->dry_;
+    }
+
+    // Processing
+
+    void init()
+    {
+        for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
+            memset(this->levels_[i], 0, (nb_inputs + MixerOutput::kFXCount - 1) * sizeof(float32_t));
+        
+        for(size_t i = 0; i < StereoChannels::kNumChannels; ++i) 
+            memset(this->input_samples_[i], 0, (nb_inputs + MixerOutput::kFXCount - 1) * sizeof(float32_t));
+
+        this->reset();
+    }
+
+    void reset()
+    {
+        for(size_t i = 0; i < nb_inputs; ++i)
+        {
+            memset(this->input_sample_buffer_[StereoChannels::Left ][i], 0, this->BufferSize);
+            memset(this->input_sample_buffer_[StereoChannels::Right][i], 0, this->BufferSize);
+        }
+
+        for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
+        {
+            this->fx_[i]->reset();
+        }
+
+        for(size_t i = 0; i < MixerOutput::MainOutput; ++i)
+        {
+            this->setReturnSample(static_cast<MixerOutput>(i), 0.0f, 0.0f);
+        }
+    }
+
+    void processSample(float32_t& outL, float32_t& outR)
+    {
+        float32_t fx_inputs_[MixerOutput::kFXCount][StereoChannels::kNumChannels];
+        float32_t fx_outputs_[MixerOutput::kFXCount][StereoChannels::kNumChannels];
+
+        for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
+        {
+            // Compute the samples that will feed the MixerOutput and process MixerOutput
+            fx_inputs_[i][StereoChannels::Left ] = arm_weighted_sum_f32(this->input_samples_[StereoChannels::Left ], this->levels_[i], nb_inputs + MixerOutput::kFXCount - 1);
+            fx_inputs_[i][StereoChannels::Right] = arm_weighted_sum_f32(this->input_samples_[StereoChannels::Right], this->levels_[i], nb_inputs + MixerOutput::kFXCount - 1);
+
+            // Process the FX
+            this->fx_[i]->processSample(
+                fx_inputs_[i][StereoChannels::Left],
+                fx_inputs_[i][StereoChannels::Right],
+                fx_outputs_[i][StereoChannels::Left],
+                fx_outputs_[i][StereoChannels::Right]
+            );
+
+            if(i != MixerOutput::MainOutput)
+            {
+                // Feedback the resulting samples except for the main output
+                this->setReturnSample(
+                    static_cast<MixerOutput>(i), 
+                    fx_outputs_[i][StereoChannels::Left],
+                    fx_outputs_[i][StereoChannels::Right]
+                );
+            }
+        }
+
+        // Return this main output sample
+        outL = fx_inputs_[MixerOutput::MainOutput][StereoChannels::Left];
+        outR = fx_inputs_[MixerOutput::MainOutput][StereoChannels::Right];
+    }
+
+    void prepare()
+    {
+        for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
+        {
+            this->fx_[i]->prepare();
+        }
+    }
+
+    void process(float32_t* outL, float32_t* outR)
+    {
+        this->prepare();
+
+        for(size_t s = 0; s < this->BufferSize; ++s)
+        {
+            for(size_t in = 0; in < nb_inputs; ++in)
+            {
+                this->setSample(
+                    in, 
+                    this->input_sample_buffer_[StereoChannels::Left ][in][s], 
+                    this->input_sample_buffer_[StereoChannels::Right][in][s]
+                );
+            }
+
+            this->processSample(*outL, *outR);
+            ++outL;
+            ++outR;
+        }
+    }
+
+protected:
+    void updatePan(size_t in)
+    {
+        float32_t pan = mapfloat(this->pan_[StereoChannels::kNumChannels][in], 0.0f, 1.0f, 0.0, Constants::MPI_2);
+        this->pan_[StereoChannels::Left ][in] = arm_sin_f32(pan) * this->channel_level_[in];
+        this->pan_[StereoChannels::Right][in] = arm_cos_f32(pan) * this->channel_level_[in];
+    }
+
+    void setLevel(size_t in, MixerOutput fx, float32_t lvl)
+    {
+        assert(in < (nb_inputs + MixerOutput::kFXCount - 1));
+        assert(fx < MixerOutput::kFXCount);
+
+        this->levels_[fx][in] = constrain(lvl, 0.0f, 1.0f);
+    }
+
+    void setSample(size_t in, float32_t sampleL, float32_t sampleR)
+    {
+        assert(in < (nb_inputs + MixerOutput::kFXCount - 1));
+        this->input_samples_[StereoChannels::Left ][in] = sampleL;
+        this->input_samples_[StereoChannels::Right][in] = sampleR;
+    }
+
+private:
+    const size_t BufferSize;
+
+    float32_t channel_level_[nb_inputs];
+    float32_t pan_[StereoChannels::kNumChannels + 1][nb_inputs];
+    float32_t* input_sample_buffer_[StereoChannels::kNumChannels][nb_inputs];
+    float32_t input_samples_[StereoChannels::kNumChannels][nb_inputs + MixerOutput::kFXCount - 1];
+    float32_t levels_[MixerOutput::kFXCount][nb_inputs + MixerOutput::kFXCount - 1];
+
+    FXElement* fx_[MixerOutput::kFXCount];
+    FXUnit2<Tube>* tube_;
+    FXUnit2<Chorus>* chorus_;
+    FXUnit2<Flanger>* flanger_;
+    FXUnit2<Orbitone>* orbitone_;
+    FXUnit2<Phaser>* phaser_;
+    FXUnit2<Delay>* delay_;
+    FXUnit2<AudioEffectPlateReverb>* plate_reverb_;
+    FXUnit2<ShimmerReverb>* shimmer_reverb_;
+    FXUnit2<Dry>* dry_;
+};
\ No newline at end of file
diff --git a/src/test/Makefile b/src/test/Makefile
index 2187b33..32f972f 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -50,12 +50,8 @@ $(OBJDIR)/%.o: %.cpp $(OBJDIR)
 $(OBJDIR)/%.o: ../%.cpp $(OBJDIR)
 	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
 
-# $(EXE): $(call wildcard,$(TST_OBJS)) $(call wildcard,$(FX__OBJS))
 $(EXE): $(TST_OBJS) $(FX__OBJS)
 	$(LD) $(CXXFLAGS) $(call wildcard,$(TST_OBJS)) $(call wildcard,$(FX__OBJS)) -o $@ $(LIBS)
 
-test_mixing_console.cpp: ../mixing_console.h ../mixing_console.cpp
-	touch $@
-
 clean:
 	rm -rf *.o $(OBJDIR) $(EXE) $(OUTPUT_FOLDER)
diff --git a/src/test/test_fx_components.cpp b/src/test/test_fx_components.cpp
index 17a9672..a38ea4a 100644
--- a/src/test/test_fx_components.cpp
+++ b/src/test/test_fx_components.cpp
@@ -14,7 +14,7 @@
 
 #include "../fx_rack.h"
 #include "../effect_platervbstereo.h"
-#include "../mixing_console.h"
+#include "../mixing_console.hpp"
 
 #define MAX_SVF_SAMPLES 10000000
 #define MAX_NB_ERRORS 100
diff --git a/src/test/test_fx_rack.cpp b/src/test/test_fx_rack.cpp
index 864ffce..9f5cc22 100644
--- a/src/test/test_fx_rack.cpp
+++ b/src/test/test_fx_rack.cpp
@@ -6,7 +6,6 @@
 
 #include "../fx_rack.h"
 #include "../effect_platervbstereo.h"
-#include "../mixing_console.h"
 
 using namespace std;
 
diff --git a/src/test/test_mixing_console.cpp b/src/test/test_mixing_console.cpp
index d63be82..5e24a0c 100644
--- a/src/test/test_mixing_console.cpp
+++ b/src/test/test_mixing_console.cpp
@@ -3,7 +3,7 @@
 #include "test_fx_helper.h"
 #include "wave.h"
 
-#include "../mixing_console.h"
+#include "../mixing_console.hpp"
 
 TEST(MixerOutputTest, toStringForTube)
 {