diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index a988a36b..92149372 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -98,6 +98,13 @@ if(ASIOSDK_DIR)
     target_compile_definitions(juce_plugin_modules PUBLIC JUCE_ASIO=1)
 endif()
 
+if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/math_approx")
+    message(STATUS "Configuring math_approx")
+    add_subdirectory(math_approx)
+    target_link_libraries(juce_plugin_modules PUBLIC math_approx)
+    target_compile_definitions(juce_plugin_modules PRIVATE BYOD_USE_MATH_APPROX=1)
+endif()
+
 if(IOS)
     target_link_libraries(juce_plugin_modules PRIVATE juce::juce_product_unlocking)
     target_compile_definitions(juce_plugin_modules PUBLIC JUCE_IN_APP_PURCHASES=1)
diff --git a/modules/RTNeural b/modules/RTNeural
index 1e7b5703..04cb333b 160000
--- a/modules/RTNeural
+++ b/modules/RTNeural
@@ -1 +1 @@
-Subproject commit 1e7b570348c01cd5e05c60082fc92d55d70186c2
+Subproject commit 04cb333bc4b174760958a77c7ce076eae38fe8e4
diff --git a/modules/chowdsp_wdf b/modules/chowdsp_wdf
index 0dfd1bdf..7a3c85e4 160000
--- a/modules/chowdsp_wdf
+++ b/modules/chowdsp_wdf
@@ -1 +1 @@
-Subproject commit 0dfd1bdf98d4276a637d314f6a97ea74778740bd
+Subproject commit 7a3c85e47346af7765c23c8855b032f6c0bcdedb
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d1f78446..9225fabe 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -167,10 +167,6 @@ if (NOT(${JAI_COMPILER} STREQUAL "JAI_COMPILER-NOTFOUND"))
 endif()
 
 # AVX/SSE files for accelerated neural nets
-if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../modules/math_approx")
-    message(STATUS "Using RTNeural with math_approx")
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../modules/math_approx" math_approx)
-endif()
 make_lib_simd_runtime(rnn_accelerated processors/drive/neural_utils/RNNAccelerated.cpp)
 foreach(target IN ITEMS rnn_accelerated_sse_or_arm rnn_accelerated_avx)
     target_link_libraries(${target} PRIVATE config_flags juce::juce_recommended_lto_flags warning_flags)
@@ -187,6 +183,7 @@ foreach(target IN ITEMS rnn_accelerated_sse_or_arm rnn_accelerated_avx)
         CXX_VISIBILITY_PRESET hidden
     )
     if(TARGET math_approx)
+        message(STATUS "Using math_approx for ${target}")
         target_compile_definitions(${target} PRIVATE RTNEURAL_USE_MATH_APPROX=1)
         target_link_libraries(${target} PRIVATE math_approx)
     endif()
diff --git a/src/pch.h b/src/pch.h
index 75662fb8..e58f5499 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -38,6 +38,10 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE
 #include "jai/SharedJaiContext.h"
 #endif
 
+#if BYOD_USE_MATH_APPROX
+#include <math_approx/math_approx.hpp>
+#endif
+
 // global definitions
 using Parameters = std::vector<std::unique_ptr<juce::RangedAudioParameter>>;
 using ParamLayout = AudioProcessorValueTreeState::ParameterLayout;
diff --git a/src/processors/drive/diode_circuits/DiodeClipperWDF.h b/src/processors/drive/diode_circuits/DiodeClipperWDF.h
index d329d555..d370a12d 100644
--- a/src/processors/drive/diode_circuits/DiodeClipperWDF.h
+++ b/src/processors/drive/diode_circuits/DiodeClipperWDF.h
@@ -1,8 +1,9 @@
 #pragma once
 
 #include <pch.h>
+#include "OmegaProvider.h"
 
-template <template <typename, typename, wdft::DiodeQuality> typename DiodeType>
+template <template <typename, typename, wdft::DiodeQuality, typename> typename DiodeType>
 class DiodeClipperWDF
 {
 public:
@@ -96,7 +97,7 @@ class DiodeClipperWDF
     Cap C1 { capVal };
 
     wdft::WDFParallelT<wdf_type, Cap, ResVs> P1 { C1, Vs };
-    DiodeType<wdf_type, decltype (P1), wdft::DiodeQuality::Best> dp { P1, 2.52e-9f };
+    DiodeType<wdf_type, decltype (P1), wdft::DiodeQuality::Best, OmegaProvider> dp { P1, 2.52e-9f };
 
     SmoothedValue<float, ValueSmoothingTypes::Multiplicative> cutoffSmooth;
     SmoothedValue<float, ValueSmoothingTypes::Linear> nDiodesSmooth;
diff --git a/src/processors/drive/diode_circuits/OmegaProvider.h b/src/processors/drive/diode_circuits/OmegaProvider.h
new file mode 100644
index 00000000..5050201d
--- /dev/null
+++ b/src/processors/drive/diode_circuits/OmegaProvider.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <pch.h>
+
+#if BYOD_USE_MATH_APPROX
+struct OmegaProvider
+{
+    template <typename T>
+    static T omega (T x)
+    {
+        return math_approx::wright_omega<3, 3> (x);
+    }
+};
+#else
+using OmegaProvider = chowdsp::Omega::Omega;
+#endif
diff --git a/src/processors/drive/mouse_drive/MouseDriveWDF.h b/src/processors/drive/mouse_drive/MouseDriveWDF.h
index a9409950..7fb232dd 100644
--- a/src/processors/drive/mouse_drive/MouseDriveWDF.h
+++ b/src/processors/drive/mouse_drive/MouseDriveWDF.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <pch.h>
+#include "../diode_circuits/OmegaProvider.h"
 
 class MouseDriveWDF
 {
@@ -75,7 +76,7 @@ class MouseDriveWDF
     wdft::ResistorCapacitorSeriesT<float> R6_C7 { 1.0e3f, 4.7e-6f };
     wdft::WDFSeriesT<float, decltype (R), decltype (R6_C7)> Sd { R, R6_C7 };
 
-    wdft::DiodePairT<float, decltype (Sd)> diodes { Sd, 5.0e-9f, 25.85e-3f, 2.0f };
+    wdft::DiodePairT<float, decltype (Sd), wdft::DiodeQuality::Best, OmegaProvider> diodes { Sd, 5.0e-9f, 25.85e-3f, 2.0f };
 
 private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MouseDriveWDF)
diff --git a/src/processors/drive/mxr_distortion/MXRDistWDF.h b/src/processors/drive/mxr_distortion/MXRDistWDF.h
index a1ac62ef..43990b82 100644
--- a/src/processors/drive/mxr_distortion/MXRDistWDF.h
+++ b/src/processors/drive/mxr_distortion/MXRDistWDF.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <pch.h>
+#include "../diode_circuits/OmegaProvider.h"
 
 // This circuit model was originally implemented as part of Sam Schachter's
 // Master's Thesis (https://github.com/schachtersam32/WaveDigitalFilters_Sharc/blob/master/MXR_DistPlus.h).
@@ -89,7 +90,7 @@ class MXRDistWDF
     wdft::CapacitorT<float> C5 { 1.0e-9f };
     wdft::WDFParallelT<float, decltype (C5), decltype (P4)> P3 { C5, P4 };
 
-    wdft::DiodePairT<float, decltype (P3), wdft::DiodeQuality::Best> DP { P3, 2.52e-9f, 25.85e-3f * 1.75f };
+    wdft::DiodePairT<float, decltype (P3), wdft::DiodeQuality::Best, OmegaProvider> DP { P3, 2.52e-9f, 25.85e-3f * 1.75f };
 
 private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MXRDistWDF)
diff --git a/src/processors/drive/tube_screamer/TubeScreamerWDF.h b/src/processors/drive/tube_screamer/TubeScreamerWDF.h
index 20adf28d..68964562 100644
--- a/src/processors/drive/tube_screamer/TubeScreamerWDF.h
+++ b/src/processors/drive/tube_screamer/TubeScreamerWDF.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <pch.h>
+#include "../diode_circuits/OmegaProvider.h"
 
 class TubeScreamerWDF
 {
@@ -108,7 +109,7 @@ class TubeScreamerWDF
     wdft::ResistorCapacitorParallelT<float> R6_P1_par_C4 { R6, 51.0e-12f };
     wdft::WDFParallelT<float, decltype (R6_P1_par_C4), decltype (R)> P3 { R6_P1_par_C4, R };
 
-    wdft::DiodePairT<float, decltype (P3)> dp { P3, 4.352e-9f, Vt, 1.906f }; // 1N4148
+    wdft::DiodePairT<float, decltype (P3), wdft::DiodeQuality::Best, OmegaProvider> dp { P3, 4.352e-9f, Vt, 1.906f }; // 1N4148
 
     SmoothedValue<float, ValueSmoothingTypes::Linear> nDiodesSmooth;
     SmoothedValue<float, ValueSmoothingTypes::Linear> gainSmooth;
diff --git a/src/processors/drive/zen_drive/ZenDriveWDF.h b/src/processors/drive/zen_drive/ZenDriveWDF.h
index 3e2f6602..1bbf7b58 100644
--- a/src/processors/drive/zen_drive/ZenDriveWDF.h
+++ b/src/processors/drive/zen_drive/ZenDriveWDF.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <pch.h>
+#include "../diode_circuits/OmegaProvider.h"
 
 class ZenDriveWDF
 {
@@ -111,7 +112,7 @@ class ZenDriveWDF
     wdft::ResistorCapacitorParallelT<float> Rv9_C4 { R9, 100.0e-12f };
     wdft::WDFParallelT<float, decltype (Rv9_C4), decltype (R)> P3 { Rv9_C4, R };
 
-    wdft::DiodePairT<float, decltype (P1)> diodes { P1, 5.241435962608312e-10f, 0.07877217375325735f };
+    wdft::DiodePairT<float, decltype (P1), wdft::DiodeQuality::Best, OmegaProvider> diodes { P1, 5.241435962608312e-10f, 0.07877217375325735f };
 
 private:
     SmoothedValue<float, ValueSmoothingTypes::Linear> voiceSmooth;