diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 29b933241..091179c18 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,13 +4,16 @@ XCORE-VOICE change log
 2.3.0
 -----
 
-  * CHANGED: Updated submodule fwk_io to version v3.6.0 from v3.3.0.
-  * CHANGED: Updated submodule fwk_core to version v1.1.0 from v1.0.2. 
-  * CHANGED: Updated submodule fwk_voice to version v0.8.0 from v0.7.0.  
-  * CHANGED: Updated Xmosdoc to version v6.2.0.
   * CHANGED: Updated XTC Tools to 15.3.0.
-  * REMOVED: Deleted inferencing submodule. 
+  * CHANGED: Updated submodule fwk_io to version v3.6.0 from v3.3.0.
+  * CHANGED: Updated submodule fwk_core to version v1.1.0 from v1.0.2.
+  * CHANGED: Updated submodule fwk_voice to version v0.8.0 from v0.7.0.
+  * CHANGED: Updated submodule fwk_rtos to version 3.2.0 from 3.0.5.
+  * CHANGED: Updated submodule lib_src to version 2.7.0 from 2.4.0.
+  * CHANGED: Updated submodule xscope_fileio to version 1.2.0 from 1.1.2.
+  * ADDED: lib_sw_pll submodule v2.3.1.
   * ADDED: xmos-ai-tools v1.3.1 Python requirement. 
+  * REMOVED: Deleted inferencing submodule.
   * ADDED: FFVA INT example with Cyberon speech recognition engine and model
     (DSpotter v2.2.18.0).
   * CHANGED: Moved files in folders device_memory, gpio_ctrl, intent_engine and
@@ -24,8 +27,6 @@ XCORE-VOICE change log
   * ADDED: Support for reading registers over I2C slave in FFD examples.
   * ADDED: Note in ASRC demo documentation about large latency in ASRC
     processing. References to alternative application notes have been provided.
-  * CHANGED: Updated submodule fwk_rtos to version 3.2.0 from 3.0.5.
-  * ADDED: lib_sw_pll submodule v1.1.0.
 
 2.2.0
 -----
diff --git a/examples/ffd/bsp_config/XK_VOICE_L71/platform/platform_init.c b/examples/ffd/bsp_config/XK_VOICE_L71/platform/platform_init.c
index 9b09714d3..f2df67802 100644
--- a/examples/ffd/bsp_config/XK_VOICE_L71/platform/platform_init.c
+++ b/examples/ffd/bsp_config/XK_VOICE_L71/platform/platform_init.c
@@ -143,9 +143,10 @@ static void platform_sw_pll_init(void)
 
     // Allow p_bclk_count to count bclks
     port_set_clock(p_bclk_count, ck_bclk);
-    sw_pll_init(&sw_pll,
+    sw_pll_lut_init(&sw_pll,
                 SW_PLL_15Q16(0.0),
                 SW_PLL_15Q16(1.0),
+                SW_PLL_15Q16(0.0),
                 PLL_CONTROL_LOOP_COUNT_INT,
                 PLL_RATIO,
                 (appconfBCLK_NOMINAL_HZ / appconfLRCLK_NOMINAL_HZ),
diff --git a/examples/ffd/src/main.c b/examples/ffd/src/main.c
index 431446283..028bb7c09 100644
--- a/examples/ffd/src/main.c
+++ b/examples/ffd/src/main.c
@@ -81,7 +81,7 @@ void sw_pll_control(void *args)
         uint16_t mclk_pt = port_get_trigger_time(i2s_callback_args->p_mclk_count); // Immediately sample mclk_count
         uint16_t bclk_pt = port_get_trigger_time(i2s_callback_args->p_bclk_count); // Now grab bclk_count (which won't have changed)
 
-        sw_pll_do_control(i2s_callback_args->sw_pll, mclk_pt, bclk_pt);
+        sw_pll_lut_do_control(i2s_callback_args->sw_pll, mclk_pt, bclk_pt);
     }
 }
 #endif
diff --git a/examples/ffva/bsp_config/XK_VOICE_L71/platform/platform_init.c b/examples/ffva/bsp_config/XK_VOICE_L71/platform/platform_init.c
index 0ab434387..8fbb692e6 100644
--- a/examples/ffva/bsp_config/XK_VOICE_L71/platform/platform_init.c
+++ b/examples/ffva/bsp_config/XK_VOICE_L71/platform/platform_init.c
@@ -191,9 +191,10 @@ static void platform_sw_pll_init(void)
 
     // Allow p_bclk_count to count bclks
     port_set_clock(p_bclk_count, ck_bclk);
-    sw_pll_init(&sw_pll,
+    sw_pll_lut_init(&sw_pll,
                 SW_PLL_15Q16(0.0),
                 SW_PLL_15Q16(1.0),
+                SW_PLL_15Q16(0.0),
                 PLL_CONTROL_LOOP_COUNT_INT,
                 PLL_RATIO,
                 (appconfBCLK_NOMINAL_HZ / appconfLRCLK_NOMINAL_HZ),
diff --git a/examples/ffva/src/main.c b/examples/ffva/src/main.c
index faa80a72b..eb12d4053 100644
--- a/examples/ffva/src/main.c
+++ b/examples/ffva/src/main.c
@@ -75,7 +75,7 @@ void i2s_slave_intertile(void *args) {
     uint16_t mclk_pt = port_get_trigger_time(i2s_callback_args->p_mclk_count); // Immediately sample mclk_count
     uint16_t bclk_pt = port_get_trigger_time(i2s_callback_args->p_bclk_count); // Now grab bclk_count (which won't have changed)
 
-    sw_pll_do_control(i2s_callback_args->sw_pll, mclk_pt, bclk_pt);
+    sw_pll_lut_do_control(i2s_callback_args->sw_pll, mclk_pt, bclk_pt);
 #endif
 
     }
diff --git a/modules/sample_rate_conversion/lib_src b/modules/sample_rate_conversion/lib_src
index e3bb06513..3b25970d8 160000
--- a/modules/sample_rate_conversion/lib_src
+++ b/modules/sample_rate_conversion/lib_src
@@ -1 +1 @@
-Subproject commit e3bb065134b52d0b16bb123a3d40c0761d30f2a5
+Subproject commit 3b25970d8842a71127473cc3c786e25973d271fd
diff --git a/modules/sw_pll b/modules/sw_pll
index 6c5db866a..0a24b96f2 160000
--- a/modules/sw_pll
+++ b/modules/sw_pll
@@ -1 +1 @@
-Subproject commit 6c5db866a13ff20d5d23845e542f39951bca5592
+Subproject commit 0a24b96f2a380d0ecb6c310de2c5e845dffbd894
diff --git a/modules/xscope_fileio/xscope_fileio b/modules/xscope_fileio/xscope_fileio
index 52cff0826..10c696a47 160000
--- a/modules/xscope_fileio/xscope_fileio
+++ b/modules/xscope_fileio/xscope_fileio
@@ -1 +1 @@
-Subproject commit 52cff0826b2773beec49044a0729bb000c011379
+Subproject commit 10c696a47c3168704a749dd9d79f192ae42965f9