diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index a62b393..f8eefb6 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -3,9 +3,9 @@
 		{
 			"name": "GCC 11.4.0 x86_64-linux-gnu",
 			"includePath": [
-				"${workspaceFolder}/modules/**",
+				"${workspaceFolder}/Modules/**",
 				"${workspaceFolder}/JuceLibraryCode/**",
-				"${workspaceFolder}/include/**",
+				"${workspaceFolder}/Sources/**",
 			],
 			"defines": [],
 			"compilerPath": "/usr/bin/gcc",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6c396e..1218bb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,15 @@ cmake_minimum_required (VERSION 3.22...3.29 FATAL_ERROR)
 
 list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/share/cmake/Modules")
 
+if (NOT DEFINED CMAKE_CONFIGURATION_TYPES)
+    set (CMAKE_CONFIGURATION_TYPES "")
+    list (APPEND CMAKE_CONFIGURATION_TYPES "Debug" "Release")
+endif ()
+
+if (NOT DEFINED CMAKE_BUILD_TYPE)
+    set (CMAKE_BUILD_TYPE "Debug")
+endif ()
+
 include (GetGitRevListCount)
 get_git_rev_list_count ()
 
@@ -118,6 +127,12 @@ foreach (STONEYDSP_BIQUADS_UNIT_FILE IN LISTS STONEYDSP_BIQUADS_UNIT_FILES)
     add_library (${STONEYDSP_BIQUADS_UNIT_FILE} INTERFACE)
     add_library (StoneyDSP::Biquads::${STONEYDSP_BIQUADS_UNIT_FILE} ALIAS ${STONEYDSP_BIQUADS_UNIT_FILE})
 
+    # target_include_directories (${STONEYDSP_BIQUADS_UNIT_FILE}
+    #     INTERFACE
+    #         $<BUILD_INTERFACE:${STONEYDSP_BIQUADS_BINARY_DIR}/Biquads_Audio_Plugin_artefacts/Sources>
+    #         $<INSTALL_INTERFACE:include/StoneyDSP/Biquads>
+    # )
+
     if (CMAKE_MAJOR_VERSION GREATER_EQUAL 3 AND (CMAKE_MINOR_VERSION LESS 23))
 
         target_include_directories (${STONEYDSP_BIQUADS_UNIT_FILE}
diff --git a/Sources/Biquads.hpp b/Sources/Biquads.hpp
index 40c2b88..7b9aaad 100644
--- a/Sources/Biquads.hpp
+++ b/Sources/Biquads.hpp
@@ -105,7 +105,7 @@ template struct Polar<double>;
   /// @} group StoneyDSP
 } // namespace StoneyDSP
 
-#include "Parameters/Parameters.hpp"
-#include "Wrapper/Wrapper.hpp"
-#include "Processor/Processor.hpp"
-#include "Editor/Editor.hpp"
+// #include "Parameters/Parameters.hpp"
+// #include "Wrapper/Wrapper.hpp"
+// #include "Processor/Processor.hpp"
+// #include "Editor/Editor.hpp"
diff --git a/Sources/Editor/Editor.hpp b/Sources/Editor/Editor.hpp
index ef60653..210db6a 100644
--- a/Sources/Editor/Editor.hpp
+++ b/Sources/Editor/Editor.hpp
@@ -25,23 +25,23 @@
 #pragma once
 #define STONEYDSP_BIQUADS_EDITOR_HPP_INCLUDED
 
-#ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
-#include <juce_audio_basics/juce_audio_basics.h>
-#include <juce_audio_devices/juce_audio_devices.h>
-#include <juce_audio_formats/juce_audio_formats.h>
-#include <juce_audio_plugin_client/juce_audio_plugin_client.h>
-#include <juce_audio_processors/juce_audio_processors.h>
-#include <juce_audio_utils/juce_audio_utils.h>
-#include <juce_core/juce_core.h>
-#include <juce_data_structures/juce_data_structures.h>
-#include <juce_dsp/juce_dsp.h>
-#include <juce_events/juce_events.h>
-#include <juce_graphics/juce_graphics.h>
-#include <juce_gui_basics/juce_gui_basics.h>
-#include <juce_gui_extra/juce_gui_extra.h>
-#endif
-
-// #include <Biquads.hpp>
+#include "../Biquads.hpp"
+
+// #ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
+// #include <juce_audio_basics/juce_audio_basics.h>
+// #include <juce_audio_devices/juce_audio_devices.h>
+// #include <juce_audio_formats/juce_audio_formats.h>
+// #include <juce_audio_plugin_client/juce_audio_plugin_client.h>
+// #include <juce_audio_processors/juce_audio_processors.h>
+// #include <juce_audio_utils/juce_audio_utils.h>
+// #include <juce_core/juce_core.h>
+// #include <juce_data_structures/juce_data_structures.h>
+// #include <juce_dsp/juce_dsp.h>
+// #include <juce_events/juce_events.h>
+// #include <juce_graphics/juce_graphics.h>
+// #include <juce_gui_basics/juce_gui_basics.h>
+// #include <juce_gui_extra/juce_gui_extra.h>
+// #endif
 
 namespace StoneyDSP {
 /** @addtogroup StoneyDSP @{ */
diff --git a/Sources/Parameters/Parameters.hpp b/Sources/Parameters/Parameters.hpp
index 8b2fc18..59a8a9f 100644
--- a/Sources/Parameters/Parameters.hpp
+++ b/Sources/Parameters/Parameters.hpp
@@ -25,18 +25,18 @@
 #pragma once
 #define STONEYDSP_BIQUADS_PARAMETERS_HPP_INCLUDED
 
-#ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
-#include <juce_audio_basics/juce_audio_basics.h>                                // depends: juce_core
-#include <juce_audio_processors/juce_audio_processors.h>                        // depends: juce_gui_extra, juce_audio_basics
-#include <juce_core/juce_core.h>                                                //
-#include <juce_data_structures/juce_data_structures.h>                          // depends: juce_events
-#include <juce_events/juce_events.h>                                            // depends: juce_core
-#include <juce_graphics/juce_graphics.h>                                        // depends: juce_events
-#include <juce_gui_basics/juce_gui_basics.h>                                    // depends: juce_graphics, juce_data_structures
-#include <juce_gui_extra/juce_gui_extra.h>                                      // depends: juce_gui_basics
-#endif // STONEYDSP_BIQUADS_HPP_INCLUDED
-
-// #include <Biquads.hpp>
+#include "../Biquads.hpp"
+
+// #ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
+// #include <juce_audio_basics/juce_audio_basics.h>                                // depends: juce_core
+// #include <juce_audio_processors/juce_audio_processors.h>                        // depends: juce_gui_extra, juce_audio_basics
+// #include <juce_core/juce_core.h>                                                //
+// #include <juce_data_structures/juce_data_structures.h>                          // depends: juce_events
+// #include <juce_events/juce_events.h>                                            // depends: juce_core
+// #include <juce_graphics/juce_graphics.h>                                        // depends: juce_events
+// #include <juce_gui_basics/juce_gui_basics.h>                                    // depends: juce_graphics, juce_data_structures
+// #include <juce_gui_extra/juce_gui_extra.h>                                      // depends: juce_gui_basics
+// #endif // STONEYDSP_BIQUADS_HPP_INCLUDED
 
 namespace StoneyDSP {
 /** @addtogroup StoneyDSP @{ */
diff --git a/Sources/Processor/Processor.hpp b/Sources/Processor/Processor.hpp
index 39b884d..3053d8d 100644
--- a/Sources/Processor/Processor.hpp
+++ b/Sources/Processor/Processor.hpp
@@ -25,25 +25,25 @@
 #pragma once
 #define STONEYDSP_BIQUADS_PROCESSOR_HPP_INCLUDED
 
-#ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
-#include <juce_audio_basics/juce_audio_basics.h>                                // depends: juce_core
-#include <juce_audio_formats/juce_audio_formats.h>                              // depends: juce_audio_basics
-#include <juce_audio_processors/juce_audio_processors.h>                        // depends: juce_gui_extra, juce_audio_basics
-#include <juce_core/juce_core.h>                                                //
-#include <juce_data_structures/juce_data_structures.h>                          // depends: juce_events
-#include <juce_dsp/juce_dsp.h>                                                  // depends: juce_audio_formats
-#include <juce_events/juce_events.h>                                            // depends: juce_core
-#include <juce_graphics/juce_graphics.h>                                        // depends: juce_events
-#include <juce_gui_basics/juce_gui_basics.h>                                    // depends: juce_graphics, juce_data_structures
-#include <juce_gui_extra/juce_gui_extra.h>                                      // depends: juce_gui_basics
+#include "../Biquads.hpp"
+#include "../Parameters/Parameters.hpp"
+#include "../Wrapper/Wrapper.hpp"
 
-#include <stoneydsp_audio/stoneydsp_audio.h>
-#include <stoneydsp_core/stoneydsp_core.h>
-#endif // STONEYDSP_BIQUADS_HPP_INCLUDED
+// #ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
+// #include <juce_audio_basics/juce_audio_basics.h>                                // depends: juce_core
+// #include <juce_audio_formats/juce_audio_formats.h>                              // depends: juce_audio_basics
+// #include <juce_audio_processors/juce_audio_processors.h>                        // depends: juce_gui_extra, juce_audio_basics
+// #include <juce_core/juce_core.h>                                                //
+// #include <juce_data_structures/juce_data_structures.h>                          // depends: juce_events
+// #include <juce_dsp/juce_dsp.h>                                                  // depends: juce_audio_formats
+// #include <juce_events/juce_events.h>                                            // depends: juce_core
+// #include <juce_graphics/juce_graphics.h>                                        // depends: juce_events
+// #include <juce_gui_basics/juce_gui_basics.h>                                    // depends: juce_graphics, juce_data_structures
+// #include <juce_gui_extra/juce_gui_extra.h>                                      // depends: juce_gui_basics
 
-// #include <Biquads.hpp>
-// #include <Parameters/Parameters.hpp>
-// #include <Wrapper/Wrapper.hpp>
+// #include <stoneydsp_audio/stoneydsp_audio.h>
+// #include <stoneydsp_core/stoneydsp_core.h>
+// #endif // STONEYDSP_BIQUADS_HPP_INCLUDED
 
 // #include "Biquads.hpp"
 // #include "Parameters.hpp"
diff --git a/Sources/Wrapper/Wrapper.cpp b/Sources/Wrapper/Wrapper.cpp
index fcbd967..706d11e 100644
--- a/Sources/Wrapper/Wrapper.cpp
+++ b/Sources/Wrapper/Wrapper.cpp
@@ -44,54 +44,50 @@ AudioPluginAudioProcessorWrapper<SampleType>::AudioPluginAudioProcessorWrapper(A
 
 , biquadArraySize(static_cast<std::size_t>(4)) // cannot ‘dynamic_cast’ this - target  type is not pointer or reference...
 
-, masterBypassPtr(static_cast <juce::AudioParameterBool*>(apvts.getParameter("Master_bypassID")))
-, masterOutputPtr(static_cast <juce::AudioParameterFloat*>(apvts.getParameter("Master_outputID")))
-, masterMixPtr(static_cast <juce::AudioParameterFloat*>(apvts.getParameter("Master_mixID")))
-, masterOsPtr(static_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_osID")))
-, masterTransformPtr(static_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_transformID")))
+, masterBypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Master_bypassID")))
+, masterOutputPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Master_outputID")))
+, masterMixPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Master_mixID")))
+, masterOsPtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_osID")))
+, masterTransformPtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_transformID")))
+
+// , biquadsABypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Band_A_bypassID")))
+// , biquadsAFrequencyPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_A_frequencyID")))
+// , biquadsAResonancePtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_A_resonanceID")))
+// , biquadsAGainPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_A_gainID")))
+// , biquadsATypePtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Band_A_typeID")))
+
+// , biquadsBBypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Band_B_bypassID")))
+// , biquadsBFrequencyPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_B_frequencyID")))
+// , biquadsBResonancePtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_B_resonanceID")))
+// , biquadsBGainPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_B_gainID")))
+// , biquadsBTypePtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Band_B_typeID")))
+
+// , biquadsCBypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Band_C_bypassID")))
+// , biquadsCFrequencyPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_C_frequencyID")))
+// , biquadsCResonancePtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_C_resonanceID")))
+// , biquadsCGainPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_C_gainID")))
+// , biquadsCTypePtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Band_C_typeID")))
+
+// , biquadsDBypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Band_D_bypassID")))
+// , biquadsDFrequencyPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_D_frequencyID")))
+// , biquadsDResonancePtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_D_resonanceID")))
+// , biquadsDGainPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_D_gainID")))
+// , biquadsDTypePtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Band_D_typeID")))
+
+, bypassState(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Master_bypassID")))
 
-, bypassState(static_cast <juce::AudioParameterBool*>(apvts.getParameter("Master_bypassID")))
 , biquadsBypassPtrArray()
 , biquadsFrequencyPtrArray()
 , biquadsResonancePtrArray()
 , biquadsGainPtrArray()
 , biquadsFilterTypePtrArray()
-// , biquadsBypassPtrArray
-// {
-//         dynamic_cast <bool*>(apvts.getParameter("Band_A_bypassID"))
-//     ,   dynamic_cast <bool*>(apvts.getParameter("Band_B_bypassID"))
-//     ,   dynamic_cast <bool*>(apvts.getParameter("Band_C_bypassID"))
-//     ,   dynamic_cast <bool*>(apvts.getParameter("Band_D_bypassID"))
-// }
-// , biquadsFrequencyPtrArray
-// {
-//         dynamic_cast <SampleType*>(apvts.getParameter("Band_A_frequencyID"))
-//     ,   dynamic_cast <SampleType*>(apvts.getParameter("Band_B_frequencyID"))
-//     ,   dynamic_cast <SampleType*>(apvts.getParameter("Band_C_frequencyID"))
-//     ,   dynamic_cast <SampleType*>(apvts.getParameter("Band_D_frequencyID"))
-// }
-// , biquadsResonancePtrArray
-// {
-//         dynamic_cast <SampleType*>(apvts.getParameter("Band_A_resonanceID"))
-//     ,   dynamic_cast <SampleType*>(apvts.getParameter("Band_B_resonanceID"))
-//     ,   dynamic_cast <SampleType*>(apvts.getParameter("Band_C_resonanceID"))
-//     ,   dynamic_cast <SampleType*>(apvts.getParameter("Band_D_resonanceID"))
-// }
-// , biquadsGainPtrArray
-// {
-//         dynamic_cast <SampleType*>(apvts.getParameter("Band_A_gainID"))
-//     ,   dynamic_cast <SampleType*>(apvts.getParameter("Band_B_gainID"))
-//     ,   dynamic_cast <SampleType*>(apvts.getParameter("Band_C_gainID"))
-//     ,   dynamic_cast <SampleType*>(apvts.getParameter("Band_D_gainID"))
-// }
-
 {
 
-    masterBypassPtr         = static_cast <juce::AudioParameterBool*>  (apvts.getParameter("Master_bypassID"));
-    masterOutputPtr         = static_cast <juce::AudioParameterFloat*> (apvts.getParameter("Master_outputID"));
-    masterMixPtr            = static_cast <juce::AudioParameterFloat*> (apvts.getParameter("Master_mixID"));
-    masterOsPtr             = static_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_osID"));
-    masterTransformPtr      = static_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_transformID"));
+    masterBypassPtr         = dynamic_cast <juce::AudioParameterBool*>  (apvts.getParameter("Master_bypassID"));
+    masterOutputPtr         = dynamic_cast <juce::AudioParameterFloat*> (apvts.getParameter("Master_outputID"));
+    masterMixPtr            = dynamic_cast <juce::AudioParameterFloat*> (apvts.getParameter("Master_mixID"));
+    masterOsPtr             = dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_osID"));
+    masterTransformPtr      = dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_transformID"));
 
     // biquadsABypassPtr       = dynamic_cast <juce::AudioParameterBool*>  (apvts.getParameter("Band_A_bypassID"));
     // biquadsAFrequencyPtr    = dynamic_cast <juce::AudioParameterFloat*> (apvts.getParameter("Band_A_frequencyID"));
@@ -119,45 +115,6 @@ AudioPluginAudioProcessorWrapper<SampleType>::AudioPluginAudioProcessorWrapper(A
 
     bypassState             = dynamic_cast <juce::AudioParameterBool*>  (apvts.getParameter("Master_bypassID"));
 
-    // biquadsBypassPtrArray =
-    // {
-    //         dynamic_cast <bool>(apvts.getParameter("Band_A_bypassID"))
-    //     ,   dynamic_cast <bool>(apvts.getParameter("Band_B_bypassID"))
-    //     ,   dynamic_cast <bool>(apvts.getParameter("Band_C_bypassID"))
-    //     ,   dynamic_cast <bool>(apvts.getParameter("Band_D_bypassID"))
-    // };
-
-    // biquadsFrequencyPtrArray =
-    // {
-    //         dynamic_cast <SampleType>(apvts.getParameter("Band_A_frequencyID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_B_frequencyID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_C_frequencyID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_D_frequencyID"))
-    // };
-
-    // biquadsResonancePtrArray =
-    // {
-    //         dynamic_cast <SampleType>(apvts.getParameter("Band_A_resonanceID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_B_resonanceID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_C_resonanceID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_D_resonanceID"))
-    // };
-
-    // biquadsGainPtrArray =
-    // {
-    //         dynamic_cast <SampleType>(apvts.getParameter("Band_A_gainID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_B_gainID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_C_gainID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_D_gainID"))
-    // };
-    // biquadsFilterTypePtrArray =
-    // {
-    //         dynamic_cast <SampleType>(apvts.getParameter("Band_A_typeID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_A_typeID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_A_typeID"))
-    //     ,   dynamic_cast <SampleType>(apvts.getParameter("Band_A_typeID"))
-    // };
-
     jassert(masterBypassPtr             != nullptr);
     jassert(masterOutputPtr             != nullptr);
     jassert(masterMixPtr                != nullptr);
@@ -190,12 +147,6 @@ AudioPluginAudioProcessorWrapper<SampleType>::AudioPluginAudioProcessorWrapper(A
 
     jassert(bypassState                 != nullptr);
 
-    // jassert(biquadsBypassPtrArray != nullptr);
-    // jassert(biquadsFrequencyPtrArray != nullptr);
-    // jassert(biquadsResonancePtrArray != nullptr);
-    // jassert(biquadsGainPtrArray != nullptr);
-    // jassert(biquadsFilterTypePtrArray != nullptr);
-
     jassert(biquadArraySize             != static_cast<std::size_t>(0));
 
     // auto osFilter = juce::dsp::Oversampling<SampleType>::filterHalfBandFIREquiripple;
@@ -390,21 +341,28 @@ void AudioPluginAudioProcessorWrapper<SampleType>::update()
     mixer->setWetMixProportion(static_cast   <SampleType>    (0.01f * masterMixPtr->get()));
 
     for(auto& biquad : biquadArray)
-    {
         biquad->setTransformType(static_cast<StoneyDSP::Audio::BiquadsBiLinearTransformationType>  (masterTransformPtr->getIndex()));
 
-        for(auto& biquadsFrequencyPtr : biquadsFrequencyPtrArray)
-            biquad->setFrequency(static_cast<SampleType>(biquadsFrequencyPtr->get()));
+    for(std::size_t i = static_cast<std::size_t>(0); i < biquadArraySize; ++i)
+    {
+        biquadArray[i]->setFrequency(static_cast<SampleType>(biquadsFrequencyPtrArray[i]->get()));
+        biquadArray[i]->setResonance(static_cast<SampleType>(biquadsResonancePtrArray[i]->get()));
+        biquadArray[i]->setGain(static_cast<SampleType>(biquadsGainPtrArray[i]->get()));
+        biquadArray[i]->setFilterType(static_cast<StoneyDSP::Audio::BiquadsFilterType>(biquadsFilterTypePtrArray[i]->getIndex()));
+    }
+
+    // for(auto& biquadsFrequencyPtr : biquadsFrequencyPtrArray)
+    //     biquad->setFrequency(static_cast<SampleType>(biquadsFrequencyPtr->get()));
 
-        for(auto& biquadsResonancePtr : biquadsResonancePtrArray)
-            biquad->setFrequency(static_cast<SampleType>(biquadsResonancePtr->get()));
+    // for(auto& biquadsResonancePtr : biquadsResonancePtrArray)
+    //     biquad->setResonance(static_cast<SampleType>(biquadsResonancePtr->get()));
 
-        for(auto& biquadsGainPtr : biquadsGainPtrArray)
-            biquad->setGain(static_cast<SampleType>(biquadsGainPtr->get()));
+    // for(auto& biquadsGainPtr : biquadsGainPtrArray)
+    //     biquad->setGain(static_cast<SampleType>(biquadsGainPtr->get()));
+
+    // for(auto& biquadsTypePtr : biquadsFilterTypePtrArray)
+    //     biquad->setFilterType(static_cast<StoneyDSP::Audio::BiquadsFilterType>(biquadsTypePtr->getIndex()));
 
-        for(auto& biquadsTypePtr : biquadsFilterTypePtrArray)
-            biquad->setFilterType(static_cast<StoneyDSP::Audio::BiquadsFilterType>(biquadsTypePtr->getIndex()));
-    }
 
     // biquadArray[0]->setFrequency     (static_cast   <SampleType>                                           (biquadsAFrequencyPtr->get()));
     // biquadArray[0]->setResonance     (static_cast   <SampleType>                                           (biquadsAResonancePtr->get()));
diff --git a/Sources/Wrapper/Wrapper.hpp b/Sources/Wrapper/Wrapper.hpp
index 90935e3..41aef3f 100644
--- a/Sources/Wrapper/Wrapper.hpp
+++ b/Sources/Wrapper/Wrapper.hpp
@@ -25,23 +25,23 @@
 #pragma once
 #define STONEYDSP_BIQUADS_WRAPPER_HPP_INCLUDED
 
-#ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
-#include <juce_audio_basics/juce_audio_basics.h>                                // depends: juce_core
-#include <juce_audio_formats/juce_audio_formats.h>                              // depends: juce_audio_basics
-#include <juce_audio_processors/juce_audio_processors.h>                        // depends: juce_gui_extra, juce_audio_basics
-#include <juce_core/juce_core.h>                                                //
-#include <juce_data_structures/juce_data_structures.h>                          // depends: juce_events
-#include <juce_dsp/juce_dsp.h>                                                  // depends: juce_audio_formats
-#include <juce_events/juce_events.h>                                            // depends: juce_core
-#include <juce_graphics/juce_graphics.h>                                        // depends: juce_events
-#include <juce_gui_basics/juce_gui_basics.h>                                    // depends: juce_graphics, juce_data_structures
-#include <juce_gui_extra/juce_gui_extra.h>                                      // depends: juce_gui_basics
-
-#include <stoneydsp_audio/stoneydsp_audio.h>
-#include <stoneydsp_core/stoneydsp_core.h>
-#endif // STONEYDSP_BIQUADS_HPP_INCLUDED
-
-// #include <Biquads.hpp>
+#include "../Biquads.hpp"
+
+// #ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
+// #include <juce_audio_basics/juce_audio_basics.h>                                // depends: juce_core
+// #include <juce_audio_formats/juce_audio_formats.h>                              // depends: juce_audio_basics
+// #include <juce_audio_processors/juce_audio_processors.h>                        // depends: juce_gui_extra, juce_audio_basics
+// #include <juce_core/juce_core.h>                                                //
+// #include <juce_data_structures/juce_data_structures.h>                          // depends: juce_events
+// #include <juce_dsp/juce_dsp.h>                                                  // depends: juce_audio_formats
+// #include <juce_events/juce_events.h>                                            // depends: juce_core
+// #include <juce_graphics/juce_graphics.h>                                        // depends: juce_events
+// #include <juce_gui_basics/juce_gui_basics.h>                                    // depends: juce_graphics, juce_data_structures
+// #include <juce_gui_extra/juce_gui_extra.h>                                      // depends: juce_gui_basics
+
+// #include <stoneydsp_audio/stoneydsp_audio.h>
+// #include <stoneydsp_core/stoneydsp_core.h>
+// #endif // STONEYDSP_BIQUADS_HPP_INCLUDED
 
 namespace StoneyDSP {
 /** @addtogroup StoneyDSP @{ */
@@ -177,11 +177,11 @@ class AudioPluginAudioProcessorWrapper
 
     //==========================================================================
     /** Parameter pointers. */
-    juce::AudioParameterBool* masterBypassPtr { nullptr };
-    juce::AudioParameterFloat* masterOutputPtr { nullptr };
-    juce::AudioParameterFloat* masterMixPtr { nullptr };
-    juce::AudioParameterChoice* masterOsPtr { nullptr };
-    juce::AudioParameterChoice* masterTransformPtr { nullptr };
+    juce::AudioParameterBool*       masterBypassPtr         { nullptr };
+    juce::AudioParameterFloat*      masterOutputPtr         { nullptr };
+    juce::AudioParameterFloat*      masterMixPtr            { nullptr };
+    juce::AudioParameterChoice*     masterOsPtr             { nullptr };
+    juce::AudioParameterChoice*     masterTransformPtr      { nullptr };
 
     // juce::AudioParameterBool*       biquadsABypassPtr       { nullptr };
     // juce::AudioParameterFloat*      biquadsAFrequencyPtr    { nullptr };
@@ -207,7 +207,7 @@ class AudioPluginAudioProcessorWrapper
     // juce::AudioParameterFloat*      biquadsDGainPtr         { nullptr };
     // juce::AudioParameterChoice*     biquadsDTypePtr         { nullptr };
 
-    juce::AudioParameterBool* bypassState { nullptr };
+    juce::AudioParameterBool*       bypassState             { nullptr };
 
     juce::AudioParameterBool* biquadsBypassPtrArray[4];
     juce::AudioParameterFloat* biquadsFrequencyPtrArray[4];
diff --git a/VERSION b/VERSION
index ff0b08b..eff871e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.3.163
+1.2.3.164