diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b40ffe9a..bbf6fa48 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,20 @@
 sc_usb_audio Change Log
 =======================
 
+HEAD
+----
+    - RESOLVED:   Build issue with CODEC_MASTER (xCore is I2S slave) enabled
+    - RESOLVED:   Channel ordering issue in when TDM and CODEC_MASTER mode enabled
+
+6.11.0
+------
+    - ADDED:      Basic TDM I2S functionality added. See I2S_CHANS_PER_FRAME and I2S_MODE_TDM
+    - CHANGE:     Various optimisations in 'mixer' core to improve performance for higher 
+                  channel counts including the use of XC unsafe pointers instead of inline ASM
+    - CHANGE:     Mixer mapping disabled when MAX_MIX_COUNT is 0 since this is wasted processing.
+    - CHANGE:     Descriptor changes to allow for channel input/output channel count up to 32 
+                  (previous limit was 18)
+
 6.10.0
 ------
     - CHANGE:     Endpoint management for iAP EA Native Transport now merged into buffer() core.
diff --git a/README.rst b/README.rst
index c81c5875..b556ea6d 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 USB Audio Shared
 ................
 
-:Latest release: 6.10.0alpha2
+:Latest release: 6.11.0alpha2
 :Maintainer: xross
 :Description: USB Audio Shared Components. For use in the XMOS USB Audio Refererence Designs.
 
diff --git a/module_dfu/.cproject b/module_dfu/.cproject
index bb778c83..da068095 100644
--- a/module_dfu/.cproject
+++ b/module_dfu/.cproject
@@ -156,11 +156,7 @@
 								<option id = "com.xmos.xc.compiler.option.include.paths.23684077" name="com.xmos.xc.compiler.option.include.paths" superClass="com.xmos.xc.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources/DWARF}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu}&quot;' />
@@ -275,11 +271,7 @@
 								<option id = "com.xmos.c.compiler.option.include.paths.18653743" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources/DWARF}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu}&quot;' />
@@ -400,11 +392,7 @@
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1/xcore-xmos-elf&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources/DWARF}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents/Resources}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM/Contents}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx/xmosdfu.dSYM}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host/xmos_dfu_osx}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/host}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_dfu}&quot;' />
diff --git a/module_usb_audio/audio.xc b/module_usb_audio/audio.xc
index 434daeba..5c550503 100755
--- a/module_usb_audio/audio.xc
+++ b/module_usb_audio/audio.xc
@@ -22,9 +22,13 @@
 #include "commands.h"
 #include "xc_ptr.h"
 
-unsigned testsamples[100];
-int p = 0;
-unsigned lastSample = 0;
+
+static unsigned samplesOut[NUM_USB_CHAN_OUT];
+
+/* Two buffers for ADC data to allow for DAC and ADC ports being offset */
+static unsigned samplesIn_0[NUM_USB_CHAN_IN];
+static unsigned samplesIn_1[I2S_CHANS_ADC];
+
 #if (DSD_CHANS_DAC != 0)
 extern buffered out port:32 p_dsd_dac[DSD_CHANS_DAC];
 extern buffered out port:32 p_dsd_clk;
@@ -32,11 +36,18 @@ extern buffered out port:32 p_dsd_clk;
 
 unsigned g_adcVal = 0;
 
-//#pragma xta command "analyse path i2s_output_l i2s_output_r"
-//#pragma xta command "set required - 2000 ns"
+#ifdef XTA_TIMING_AUDIO
+#pragma xta command "add exclusion received_command"
+#pragma xta command "analyse path i2s_output_l i2s_output_r"
+#pragma xta command "set required - 2000 ns"
 
-//#pragma xta command "analyse path i2s_output_r i2s_output_l"
-//#pragma xta command "set required - 2000 ns"
+#pragma xta command "add exclusion received_command"
+#pragma xta command "add exclusion received_underflow"
+#pragma xta command "add exclusion divide_1"
+#pragma xta command "add exclusion deliver_return"
+#pragma xta command "analyse path i2s_output_r i2s_output_l"
+#pragma xta command "set required - 2000 ns"
+#endif
 
 /* I2S Data I/O*/
 #if (I2S_CHANS_DAC != 0)
@@ -142,249 +153,13 @@ static inline void doI2SClocks(unsigned divide)
 }
 #endif
 
-/* I2S delivery thread */
 #pragma unsafe arrays
-unsigned static deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, unsigned curSamFreq,
-#if(defined(SPDIF_RX) || defined(ADAT_RX))
-chanend c_dig_rx,
-#endif
-chanend ?c_adc)
+static inline unsigned DoSampleTransfer(chanend c_out, int readBuffNo, unsigned underflowWord)
 {
-#if (I2S_CHANS_ADC != 0) || defined(SPDIF)
-	unsigned sample;
-#endif
-    unsigned underflow = 0;
-#if NUM_USB_CHAN_OUT > 0
-    unsigned samplesOut[NUM_USB_CHAN_OUT];
-#endif
-#if NUM_USB_CHAN_IN > 0
-    unsigned samplesIn[NUM_USB_CHAN_IN];
-    unsigned samplesInPrev[NUM_USB_CHAN_IN];
-#endif
-    unsigned tmp;
-#if (I2S_CHANS_ADC != 0)
-    unsigned index;
-#endif
-#ifdef RAMP_CHECK
-    unsigned prev=0;
-    int started = 0;
-#endif
+    unsigned command;
+    unsigned underflow;
 
-#if (DSD_CHANS_DAC != 0)
-    unsigned dsdMarker = DSD_MARKER_2;    /* This alternates between DSD_MARKER_1 and DSD_MARKER_2 */
-    int dsdCount = 0;
-    int everyOther = 1;
-    unsigned dsdSample_l = 0x96960000;
-    unsigned dsdSample_r = 0x96960000;
-#endif
-    unsigned underflowWord = 0;
-
-#if NUM_USB_CHAN_IN > 0
-    for (int i=0;i<NUM_USB_CHAN_IN;i++)
-    {
-        samplesIn[i] = 0;
-        samplesInPrev[i] = 0;
-    }
-#endif
-
-#if(DSD_CHANS_DAC != 0)
-    if(dsdMode == DSD_MODE_DOP)
-        underflowWord = 0xFA969600;
-    else if(dsdMode == DSD_MODE_NATIVE)
-    {
-        underflowWord = 0x96969696;
-    }
-#endif
-
-    outuint(c_out, 0);
-
-    /* Check for sample freq change or new samples from mixer*/
-    if(testct(c_out))
-    {
-        unsigned command = inct(c_out);
-#ifndef CODEC_MASTER
-            // Set clocks low
-            p_lrclk <: 0;
-            p_bclk <: 0;
-#if(DSD_CHANS_DAC != 0)
-            /* DSD Clock might not be shared with lrclk or bclk... */
-            p_dsd_clk <: 0;
-#endif
-#endif
-#if (DSD_CHANS_DAC > 0)
-        if(dsdMode == DSD_MODE_DOP)
-            dsdMode = DSD_MODE_OFF;
-#endif
-        return command;
-    }
-    else
-    {
-        underflow = inuint(c_out);
-#ifndef MIXER // Interfaces straight to decouple()
-
-#if NUM_USB_CHAN_IN > 0
-#pragma loop unroll
-        for(int i = 0; i < NUM_USB_CHAN_IN; i++)
-        {
-            outuint(c_out, samplesIn[i]);
-        }
-#endif
-
-#if NUM_USB_CHAN_OUT > 0
-        if(underflow)
-        {
-#pragma loop unroll
-            for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-            {
-                samplesOut[i] = underflowWord;
-            }
-        }
-        else
-        {
-#pragma loop unroll
-            for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-            {
-                samplesOut[i] = inuint(c_out);
-            }
-        }
-#endif
-#else /* ifndef MIXER */
-
-#if NUM_USB_CHAN_OUT > 0
-        if(underflow)
-        {
-            #pragma loop unroll
-            for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-            {
-                samplesOut[i] = underflowWord;
-            }
-        }
-        else
-        {
-#pragma loop unroll
-        for(int i = 0; i < NUM_USB_CHAN_OUT; i++)
-        {
-            int tmp = inuint(c_out);
-            samplesOut[i] = tmp;
-        }
-        }
-#endif
-
-#if NUM_USB_CHAN_IN > 0
-#pragma loop unroll
-        for(int i = 0; i < NUM_USB_CHAN_IN; i++)
-        {
-            outuint(c_out, samplesIn[i]);
-        }
-#endif
-#endif
-    }
-
-#ifndef CODEC_MASTER
-#if (DSD_CHANS_DAC > 0)
-    if(dsdMode == DSD_MODE_OFF)
-    {
-#endif
-        /* b_clk must start high */
-        p_bclk <: 0x80000000;
-        sync(p_bclk);
-        /* Clear I2S port buffers */
-        clearbuf(p_lrclk);
-
-#if (I2S_CHANS_DAC != 0)
-        for(int i = 0; i < I2S_WIRES_DAC; i++)
-        {
-            clearbuf(p_i2s_dac[i]);
-        }
-#endif
-
-#if (I2S_CHANS_ADC != 0)
-        for(int i = 0; i < I2S_WIRES_ADC; i++)
-        {
-            clearbuf(p_i2s_adc[i]);
-        }
-#endif
-        if(divide == 1)
-        {
-            p_lrclk <: 0 @ tmp;
-            tmp += 100;
-
-            /* Since BCLK is free-running, setup outputs/inputs at a known point in the future */
-#if (I2S_CHANS_DAC != 0)
-#pragma loop unroll
-            for(int i = 0; i < I2S_WIRES_DAC; i++)
-            {
-                p_i2s_dac[i] @ tmp <: 0;
-            }
-#endif
-
-            p_lrclk @ tmp <: 0x7FFFFFFF;
-
-
-#if (I2S_CHANS_ADC != 0)
-            for(int i = 0; i < I2S_WIRES_ADC; i++)
-            {
-                asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp-1));
-            }
-#endif
-        }
-        else
-        {
-            clearbuf(p_bclk);
-
-#if (I2S_CHANS_DAC != 0)
-            /* Prefill the ports so data is input in advance */
-            for(int i = 0; i < I2S_WIRES_DAC; i++)
-            {
-                p_i2s_dac[i] <: 0;
-            }
-#endif
-            p_lrclk <: 0x7FFFFFFF;
-            doI2SClocks(divide);
-
-        }
-#if (DSD_CHANS_DAC > 0)
-    } /* if (!dsdMode) */
-    else
-    {
-        /* p_dsd_clk must start high */
-        p_dsd_clk <: 0x80000000;
-    }
-#endif
-#else /* ifndef CODEC_MASTER */
-
-    /* Wait for LRCLK edge */
-    p_lrclk when pinseq(0) :> void;
-    p_lrclk when pinseq(1) :> void;
-    p_lrclk when pinseq(0) :> void;
-    p_lrclk when pinseq(1) :> void;
-    p_lrclk when pinseq(0) :> void @ tmp;
-    tmp+=97;
-#if (I2S_CHANS_DAC != 0)
-#pragma loop unroll
-    for(int i = 0; i < I2S_WIRES_DAC; i++)
-    {
-        p_i2s_dac[i] @ tmp <: 0;
-    }
-#endif
-
-#if (I2S_CHANS_ADC != 0)
-#pragma loop unroll
-    for(int i = 0; i < I2S_WIRES_ADC; i++)
-    {
-        asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp+31));
-    }
-#endif
-
-    /* TODO In master mode, the i/o loop assumes L/RCLK = 32bit clocks.  We should check this every interation
-     * and resync if we got a bclk glitch */
-
-#endif
-
-    /* Main Audio I/O loop */
-    while (1)
-    {
-        outuint(c_out, 0);
+     outuint(c_out, 0);
 
         /* Check for sample freq change (or other command) or new samples from mixer*/
         if(testct(c_out))
@@ -403,6 +178,7 @@ chanend ?c_adc)
             if(dsdMode == DSD_MODE_DOP)
                 dsdMode = DSD_MODE_OFF;
 #endif
+#pragma xta endpoint "received_command"
             return command;
 
         }
@@ -412,9 +188,18 @@ chanend ?c_adc)
 #ifndef MIXER // Interfaces straight to decouple()
 #if NUM_USB_CHAN_IN > 0
 #pragma loop unroll
-            for(int i = 0; i < NUM_USB_CHAN_IN; i++)
+            for(int i = 0; i < I2S_CHANS_ADC; i++)
             {
-                outuint(c_out, samplesIn[i]);
+                if(readBuffNo)
+                    outuint(c_out, samplesIn_1[i]);
+                else
+                    outuint(c_out, samplesIn_0[i]);
+            }
+            /* Send over the digi channels - no odd buffering required */
+#pragma loop unroll
+            for(int i = I2S_CHANS_ADC; i < NUM_USB_CHAN_IN; i++)
+            {
+                outuint(c_out, samplesIn_0[i]);
             }
 #endif
 
@@ -457,17 +242,206 @@ chanend ?c_adc)
 #endif
 #if NUM_USB_CHAN_IN > 0
 #pragma loop unroll
-            for(int i = 0; i < NUM_USB_CHAN_IN; i++)
+            for(int i = 0; i < I2S_CHANS_ADC; i++)
             {
-                outuint(c_out, samplesIn[i]);
+                if(readBuffNo)
+                    outuint(c_out, samplesIn_1[i]);
+                else
+                    outuint(c_out, samplesIn_0[i]);
+            }
+            /* Send over the digi channels - no odd buffering required */
+#pragma loop unroll
+            for(int i = I2S_CHANS_ADC; i < NUM_USB_CHAN_IN; i++)
+            {
+                outuint(c_out, samplesIn_0[i]);
             }
 #endif
 #endif
         }
 
+        return 0;
+
+}
+
+static inline void InitPorts(unsigned divide)
+{
+    unsigned tmp;
+#ifndef CODEC_MASTER
+#if (DSD_CHANS_DAC > 0)
+    if(dsdMode == DSD_MODE_OFF)
+    {
+#endif
+        /* b_clk must start high */
+        p_bclk <: 0x80000000;
+        sync(p_bclk);
+        /* Clear I2S port buffers */
+        clearbuf(p_lrclk);
+
+#if (I2S_CHANS_DAC != 0)
+        for(int i = 0; i < I2S_WIRES_DAC; i++)
+        {
+            clearbuf(p_i2s_dac[i]);
+        }
+#endif
+
+#if (I2S_CHANS_ADC != 0)
+        for(int i = 0; i < I2S_WIRES_ADC; i++)
+        {
+            clearbuf(p_i2s_adc[i]);
+        }
+#endif
+        if(divide == 1)
+        {
+#pragma xta endpoint "divide_1"
+            p_lrclk <: 0 @ tmp;
+            tmp += 100;
+
+            /* Since BCLK is free-running, setup outputs/inputs at a known point in the future */
+#if (I2S_CHANS_DAC != 0)
+#pragma loop unroll
+            for(int i = 0; i < I2S_WIRES_DAC; i++)
+            {
+                p_i2s_dac[i] @ tmp <: 0;
+            }
+#endif
+
+            p_lrclk @ tmp <: 0x7FFFFFFF;
 
 
-        tmp = 0;
+#if (I2S_CHANS_ADC != 0)
+            for(int i = 0; i < I2S_WIRES_ADC; i++)
+            {
+                asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp-1));
+            }
+#endif
+        }
+        else /* Divide != 1  */
+        {
+#if (I2S_CHANS_DAC != 0)
+            /* Pre-fill the DAC ports */
+            for(int i = 0; i < I2S_WIRES_DAC; i++)
+            {
+                p_i2s_dac[i] <: 0;
+            }
+#endif
+            /* Pre-fill the LR clock output port */
+            p_lrclk <: 0x0;
+
+            doI2SClocks(divide);
+
+        }
+#if (DSD_CHANS_DAC > 0)
+    } /* if (!dsdMode) */
+    else
+    {
+        /* p_dsd_clk must start high */
+        p_dsd_clk <: 0x80000000;
+    }
+#endif
+#else /* ifndef CODEC_MASTER */
+
+    /* Wait for LRCLK edge (in I2S LRCLK = 0 is left, TDM rising edge is start of frame) */
+    p_lrclk when pinseq(0) :> void;
+    p_lrclk when pinseq(1) :> void;
+    p_lrclk when pinseq(0) :> void;
+    p_lrclk when pinseq(1) :> void;
+#ifdef I2S_MODE_TDM
+    p_lrclk when pinseq(0) :> void;
+    p_lrclk when pinseq(1) :> void @ tmp;
+#else
+    p_lrclk when pinseq(0) :> void @ tmp;
+#endif  
+   
+    tmp += (I2S_CHANS_PER_FRAME * 32) - 32 + 1 ;
+    /* E.g. 2 * 32 - 32 + 1 = 33 for stereo */
+    /* E..g 8 * 32 - 32 + 1 = 225 for 8 chan TDM */
+
+#if (I2S_CHANS_DAC != 0)
+#pragma loop unroll
+    for(int i = 0; i < I2S_WIRES_DAC; i++)
+    {
+        p_i2s_dac[i] @ tmp <: 0;
+    }
+#endif
+
+#if (I2S_CHANS_ADC != 0)
+#pragma loop unroll
+    for(int i = 0; i < I2S_WIRES_ADC; i++)
+    {
+       asm("setpt res[%0], %1"::"r"(p_i2s_adc[i]),"r"(tmp+31));
+    }
+#endif
+#endif
+}
+
+
+
+/* I2S delivery thread */
+#pragma unsafe arrays
+unsigned static deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, unsigned curSamFreq,
+#if(defined(SPDIF_RX) || defined(ADAT_RX))
+chanend c_dig_rx,
+#endif
+chanend ?c_adc)
+{
+#if (I2S_CHANS_ADC != 0) || defined(SPDIF)
+	unsigned sample;
+#endif
+    unsigned underflow = 0;
+#if NUM_USB_CHAN_OUT > 0
+#endif
+//#if NUM_USB_CHAN_IN > 0
+    /* Since DAC and ADC buffered ports off by one sample we buffer previous ADC frame */
+    unsigned readBuffNo = 0;
+//#endif
+    unsigned tmp;
+    unsigned index;
+
+#ifdef RAMP_CHECK
+    unsigned prev=0;
+    int started = 0;
+#endif
+
+#if (DSD_CHANS_DAC != 0)
+    unsigned dsdMarker = DSD_MARKER_2;    /* This alternates between DSD_MARKER_1 and DSD_MARKER_2 */
+    int dsdCount = 0;
+    int everyOther = 1;
+    unsigned dsdSample_l = 0x96960000;
+    unsigned dsdSample_r = 0x96960000;
+#endif
+    unsigned underflowWord = 0;
+
+    unsigned frameCount = 0;
+
+#if(DSD_CHANS_DAC != 0)
+    if(dsdMode == DSD_MODE_DOP)
+    {
+        underflowWord = 0xFA969600;
+    }
+    else if(dsdMode == DSD_MODE_NATIVE)
+    {
+        underflowWord = 0x96969696;
+    }
+#endif
+
+#if 1
+    unsigned command = DoSampleTransfer(c_out, readBuffNo, underflowWord);
+
+    if(command)
+    {
+        return command;
+    }
+#endif
+
+    InitPorts(divide);
+
+    /* TODO In master mode, the i/o loop assumes L/RCLK = 32bit clocks.  We should check this every interation
+     * and resync if we got a bclk glitch */
+
+    /* Main Audio I/O loop */
+    while (1)
+    {
+
 #if (DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0)
         if(dsdMode == DSD_MODE_NATIVE)
         {
@@ -575,108 +549,136 @@ chanend ?c_adc)
         else
 #endif
         {
-
-#pragma xta endpoint "i2s_output_l"
-
-#if (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0)
-#pragma loop unroll
-            for(int i = 0; i < I2S_CHANS_DAC; i+=2)
-            {
-                p_i2s_dac[tmp++] <: bitrev(samplesOut[i]);            /* Output LEFT sample to DAC */
-            }
-#endif
-
 #ifndef CODEC_MASTER
             /* LR clock delayed by one clock, This is so MSB is output on the falling edge of BCLK
              * after the falling edge on which LRCLK was toggled. (see I2S spec) */
             /* Generate clocks LR Clock low - LEFT */
+#ifdef I2S_MODE_TDM
+            p_lrclk <: 0x00000000;
+#else
             p_lrclk <: 0x80000000;
+
+#endif
+#endif
+
+#pragma xta endpoint "i2s_output_l"
+
+#if (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0)
+            index = 0;
+#pragma loop unroll
+            /* Output "even" channel to DAC (i.e. left) */
+            for(int i = 0; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME)
+            {
+                p_i2s_dac[index++] <: bitrev(samplesOut[(frameCount)+i]);
+            }
+#endif
+
+#ifndef CODEC_MASTER
+            /* Clock out the LR Clock, the DAC data and Clock in the next sample into ADC */
             doI2SClocks(divide);
 #endif
 
-
 #if (I2S_CHANS_ADC != 0)
-            /* Input prevous R sample into R in buffer */
+            /* Input previous L sample into L in buffer */
             index = 0;
+            /* First input (i.e. frameCoint == 0) we read last ADC channel of previous frame.. */
+            unsigned buffIndex = frameCount ? !readBuffNo : readBuffNo;
+
 #pragma loop unroll
-            for(int i = 1; i < I2S_CHANS_ADC; i += 2)
+            /* First time around we get channel 7 of TDM8 */
+            for(int i = 0; i < I2S_CHANS_ADC; i+=I2S_CHANS_PER_FRAME)
             {
                 // p_i2s_adc[index++] :> sample;
                 // Manual IN instruction since compiler generates an extra setc per IN (bug #15256)
                 asm volatile("in %0, res[%1]" : "=r"(sample)  : "r"(p_i2s_adc[index++]));
-#if NUM_USB_CHAN_IN > 0
-                samplesIn[i] = bitrev(sample);
 
-                /* Store the previous left in left */
-                samplesIn[i-1] = samplesInPrev[i];
-#endif
+                /* Note the use of readBuffNo changes based on frameCount */
+                if(buffIndex)
+                    samplesIn_1[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
+                else
+                    samplesIn_0[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
             }
 #endif
+
+        if(frameCount == 0)
+        {
+
 #if defined(SPDIF_RX) || defined(ADAT_RX)
-        /* Sync with clockgen */
-        inuint(c_dig_rx);
+            /* Sync with clockgen */
+            inuint(c_dig_rx);
+
+            /* Note, digi-data we just store in samplesIn_0 - we only double buffer the I2S input data */
 #endif
 #ifdef SPDIF_RX
-        asm("ldw %0, dp[g_digData]":"=r"(samplesIn[SPDIF_RX_INDEX + 0]));
-        asm("ldw %0, dp[g_digData+4]":"=r"(samplesIn[SPDIF_RX_INDEX + 1]));
+            asm("ldw %0, dp[g_digData]":"=r"(samplesIn_0[SPDIF_RX_INDEX + 0]));
+            asm("ldw %0, dp[g_digData+4]":"=r"(samplesIn_0[SPDIF_RX_INDEX + 1]));
 
 #endif
 #ifdef ADAT_RX
-        asm("ldw %0, dp[g_digData+8]":"=r"(samplesIn[ADAT_RX_INDEX]));
-        asm("ldw %0, dp[g_digData+12]":"=r"(samplesIn[ADAT_RX_INDEX + 1]));
-        asm("ldw %0, dp[g_digData+16]":"=r"(samplesIn[ADAT_RX_INDEX + 2]));
-        asm("ldw %0, dp[g_digData+20]":"=r"(samplesIn[ADAT_RX_INDEX + 3]));
-        asm("ldw %0, dp[g_digData+24]":"=r"(samplesIn[ADAT_RX_INDEX + 4]));
-        asm("ldw %0, dp[g_digData+28]":"=r"(samplesIn[ADAT_RX_INDEX + 5]));
-        asm("ldw %0, dp[g_digData+32]":"=r"(samplesIn[ADAT_RX_INDEX + 6]));
-        asm("ldw %0, dp[g_digData+36]":"=r"(samplesIn[ADAT_RX_INDEX + 7]));
+            asm("ldw %0, dp[g_digData+8]":"=r"(samplesIn_0[ADAT_RX_INDEX]));
+            asm("ldw %0, dp[g_digData+12]":"=r"(samplesIn_0[ADAT_RX_INDEX + 1]));
+            asm("ldw %0, dp[g_digData+16]":"=r"(samplesIn_0[ADAT_RX_INDEX + 2]));
+            asm("ldw %0, dp[g_digData+20]":"=r"(samplesIn_0[ADAT_RX_INDEX + 3]));
+            asm("ldw %0, dp[g_digData+24]":"=r"(samplesIn_0[ADAT_RX_INDEX + 4]));
+            asm("ldw %0, dp[g_digData+28]":"=r"(samplesIn_0[ADAT_RX_INDEX + 5]));
+            asm("ldw %0, dp[g_digData+32]":"=r"(samplesIn_0[ADAT_RX_INDEX + 6]));
+            asm("ldw %0, dp[g_digData+36]":"=r"(samplesIn_0[ADAT_RX_INDEX + 7]));
 #endif
 
 #if defined(SPDIF_RX) || defined(ADAT_RX)
         /* Request digital data (with prefill) */
-        outuint(c_dig_rx, 0);
+            outuint(c_dig_rx, 0);
 #endif
 #if defined(SPDIF) && (NUM_USB_CHAN_OUT > 0)
             outuint(c_spd_out, samplesOut[SPDIF_TX_INDEX]);  /* Forward sample to S/PDIF Tx thread */
             sample = samplesOut[SPDIF_TX_INDEX + 1];
             outuint(c_spd_out, sample);                      /* Forward sample to S/PDIF Tx thread */
 #endif
-            tmp = 0;
+        }
+
+#ifndef CODEC_MASTER
+#ifdef I2S_MODE_TDM
+            if(frameCount == (I2S_CHANS_PER_FRAME-2))
+                p_lrclk <: 0x80000000;
+            else
+               p_lrclk <: 0x00000000;
+#else
+            p_lrclk <: 0x7FFFFFFF;
+#endif
+#endif
+
+            index = 0;
 #pragma xta endpoint "i2s_output_r"
 #if (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0)
+            /* Output "odd" channel to DAC (i.e. right) */
 #pragma loop unroll
-            for(int i = 1; i < I2S_CHANS_DAC; i+=2)
+            for(int i = 1; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME)
             {
-                p_i2s_dac[tmp++] <: bitrev(samplesOut[i]);            /* Output RIGHT sample to DAC */
+                p_i2s_dac[index++] <: bitrev(samplesOut[frameCount+i]);
             }
 #endif
 
 #ifndef CODEC_MASTER
-            /* Clock out data (and LR clock) */
-            p_lrclk <: 0x7FFFFFFF;
             doI2SClocks(divide);
 #endif
 
-
 #if (I2S_CHANS_ADC != 0)
-            /* Input previous L ADC sample */
             index = 0;
+            /* Channels 0, 2, 4.. on each line */
 #pragma loop unroll
-            for(int i = 1; i < I2S_CHANS_ADC; i += 2)
+            for(int i = 0; i < I2S_CHANS_ADC; i += I2S_CHANS_PER_FRAME)
             {
-                // p_i2s_adc[index++] :> sample;
-                // Manual IN instruction since compiler generates an extra setc per IN (bug #15256)
+                /* Manual IN instruction since compiler generates an extra setc per IN (bug #15256) */
                 asm volatile("in %0, res[%1]" : "=r"(sample)  : "r"(p_i2s_adc[index++]));
-
-#if NUM_USB_CHAN_IN > 0
-                samplesInPrev[i] = bitrev(sample);
-#endif
+                if(readBuffNo)
+                    samplesIn_0[frameCount+i] = bitrev(sample);
+                else
+                    samplesIn_1[frameCount+i] = bitrev(sample);
             }
 
 #ifdef SU1_ADC_ENABLE
             {
                 unsigned x;
-
                 x = inuint(c_adc);
                 inct(c_adc);
                 asm volatile("stw %0, dp[g_adcVal]"::"r"(x));
@@ -730,7 +732,34 @@ chanend ?c_adc)
             }
         }
 #endif
+
+#ifdef I2S_MODE_TDM
+        /* Increase frameCount by 2 since we have output two channels (per data line) */
+        frameCount+=2;
+        if(frameCount == I2S_CHANS_PER_FRAME)
+#endif
+        {
+            /* Do samples transfer */
+            /* The below looks a bit odd but forces the compiler to inline twice */
+            unsigned command;
+            if(readBuffNo)
+                command = DoSampleTransfer(c_out, 1, underflowWord);
+            else
+                command = DoSampleTransfer(c_out, 0, underflowWord);
+
+
+            if(command)
+            {
+                return command;
+            }
+
+            /* Reset frame counter and flip the ADC buffer */
+            frameCount = 0;
+            readBuffNo = !readBuffNo;
+        }
     }
+
+#pragma xta endpoint "deliver_return"
     return 0;
 }
 
@@ -786,7 +815,6 @@ unsigned static dummy_deliver(chanend c_out)
 #define NUMBER_WORDS ((NUMBER_SAMPLES * NUMBER_CHANNELS+1)/2)
 #define SAMPLES_PER_PRINT 1
 
-
 void audio(chanend c_mix_out,
 #if (defined(ADAT_RX) || defined(SPDIF_RX))
 chanend c_dig_rx,
@@ -873,8 +901,13 @@ chanend ?c_config, chanend ?c)
         /* Calculate master clock to bit clock (or DSD clock) divide for current sample freq
          * e.g. 11.289600 / (176400 * 64)  = 1 */
         {
+#if I2S_MODE_TDM
+            /* I2S has 32 bits per sample. *8 as 8 channels */
+            unsigned numBits = 256;
+#else
             /* I2S has 32 bits per sample. *2 as 2 channels */
             unsigned numBits = 64;
+#endif
 
 #if (DSD_CHANS_DAC > 0)
             if(dsdMode == DSD_MODE_DOP)
@@ -888,7 +921,9 @@ chanend ?c_config, chanend ?c)
                 numBits = 32;
             }
 #endif
-            divide = mClk / ( curSamFreq * numBits );
+            divide = mClk / ( curSamFreq * numBits);
+
+            /* TODO; we should catch and handle the case when divide is 0. Currently design will lock up */
        }
 
 
diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h
index ac0505a7..d664ddc0 100644
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -76,8 +76,13 @@
     #error I2S_CHANS_DAC not defined
     #define I2S_CHANS_DAC 2          /* Define anyway for doxygen */
 #else
+
+#ifdef I2S_MODE_TDM
+#define I2S_WIRES_DAC            (I2S_CHANS_DAC >> 3)
+#else
 #define I2S_WIRES_DAC            (I2S_CHANS_DAC >> 1)
 #endif
+#endif
 
 /**
  * @brief Number of I2S channels from ADC/CODEC. Must be a multiple of 2.
@@ -88,8 +93,27 @@
     #error I2S_CHANS_ADC not defined
     #define I2S_CHANS_ADC 2      /* Define anyway for doxygen */
 #else
+
+#ifdef I2S_MODE_TDM
+#define I2S_WIRES_ADC            (I2S_CHANS_ADC >> 3)
+#else
 #define I2S_WIRES_ADC            (I2S_CHANS_ADC >> 1)
 #endif
+#endif
+
+/**
+ * @brief Channels per I2S frame. *
+ *
+ * Default: 2 i.e standard stereo I2S (8 if using TDM i.e. I2S_MODE_TDM).
+ *
+ **/
+#ifndef I2S_CHANS_PER_FRAME
+#ifdef I2S_MODE_TDM
+#define I2S_CHANS_PER_FRAME 8
+#else
+#define I2S_CHANS_PER_FRAME 2
+#endif
+#endif
 
 /**
  * @brief Max supported sample frequency for device (Hz). Default: 192000
@@ -406,7 +430,7 @@
  * @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
  */
 #ifndef BCD_DEVICE_M
-#define BCD_DEVICE_M             10
+#define BCD_DEVICE_M             11
 #endif
 
 /**
@@ -975,7 +999,7 @@
 #else
 #if defined(MIXER)
 // Enabled by default
-#define OUT_VOLUME_IN_MIXER
+//#define OUT_VOLUME_IN_MIXER
 #endif
 #endif
 
@@ -995,7 +1019,7 @@
 #else
 #if defined(MIXER)
 /* Enabled by default */
-#define IN_VOLUME_IN_MIXER
+//#define IN_VOLUME_IN_MIXER
 #endif
 #endif
 
diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h
index 54da9fda..922f94d2 100644
--- a/module_usb_audio/endpoint0/descriptors.h
+++ b/module_usb_audio/endpoint0/descriptors.h
@@ -115,7 +115,50 @@ typedef struct
     STR_TABLE_ENTRY(outputChanStr_18);
 #endif
 #if (NUM_USB_CHAN_OUT > 18)
-#error NUM_USB_CHAN > 18
+    STR_TABLE_ENTRY(outputChanStr_19);
+#endif
+#if (NUM_USB_CHAN_OUT > 19)
+    STR_TABLE_ENTRY(outputChanStr_20);
+#endif
+#if (NUM_USB_CHAN_OUT > 20)
+    STR_TABLE_ENTRY(outputChanStr_21);
+#endif
+#if (NUM_USB_CHAN_OUT > 21)
+    STR_TABLE_ENTRY(outputChanStr_22);
+#endif
+#if (NUM_USB_CHAN_OUT > 22)
+    STR_TABLE_ENTRY(outputChanStr_23);
+#endif
+#if (NUM_USB_CHAN_OUT > 23)
+    STR_TABLE_ENTRY(outputChanStr_24);
+#endif
+#if (NUM_USB_CHAN_OUT > 24)
+    STR_TABLE_ENTRY(outputChanStr_25);
+#endif
+#if (NUM_USB_CHAN_OUT > 25)
+    STR_TABLE_ENTRY(outputChanStr_26);
+#endif
+#if (NUM_USB_CHAN_OUT > 26)
+    STR_TABLE_ENTRY(outputChanStr_27);
+#endif
+#if (NUM_USB_CHAN_OUT > 27)
+    STR_TABLE_ENTRY(outputChanStr_28);
+#endif
+#if (NUM_USB_CHAN_OUT > 28)
+    STR_TABLE_ENTRY(outputChanStr_29);
+#endif
+#if (NUM_USB_CHAN_OUT > 29)
+    STR_TABLE_ENTRY(outputChanStr_30);
+#endif
+#if (NUM_USB_CHAN_OUT > 30)
+    STR_TABLE_ENTRY(outputChanStr_31);
+#endif
+#if (NUM_USB_CHAN_OUT > 31)
+    STR_TABLE_ENTRY(outputChanStr_32);
+#endif
+
+#if (NUM_USB_CHAN_OUT > 32)
+#error NUM_USB_CHAN > 32
 #endif
 
 #if (NUM_USB_CHAN_IN > 0)
@@ -173,7 +216,50 @@ typedef struct
     STR_TABLE_ENTRY(inputChanStr_18);
 #endif
 #if (NUM_USB_CHAN_IN > 18)
-#error NUM_USB_CHAN > 18
+    STR_TABLE_ENTRY(inputChanStr_19);
+#endif
+#if (NUM_USB_CHAN_IN > 19)
+    STR_TABLE_ENTRY(inputChanStr_20);
+#endif
+#if (NUM_USB_CHAN_IN > 20)
+    STR_TABLE_ENTRY(inputChanStr_21);
+#endif
+#if (NUM_USB_CHAN_IN > 21)
+    STR_TABLE_ENTRY(inputChanStr_22);
+#endif
+#if (NUM_USB_CHAN_IN > 22)
+    STR_TABLE_ENTRY(inputChanStr_23);
+#endif
+#if (NUM_USB_CHAN_IN > 23)
+    STR_TABLE_ENTRY(inputChanStr_24);
+#endif
+#if (NUM_USB_CHAN_IN > 24)
+    STR_TABLE_ENTRY(inputChanStr_25);
+#endif
+#if (NUM_USB_CHAN_IN > 25)
+    STR_TABLE_ENTRY(inputChanStr_26);
+#endif
+#if (NUM_USB_CHAN_IN > 26)
+    STR_TABLE_ENTRY(inputChanStr_27);
+#endif
+#if (NUM_USB_CHAN_IN > 27)
+    STR_TABLE_ENTRY(inputChanStr_28);
+#endif
+#if (NUM_USB_CHAN_IN > 28)
+    STR_TABLE_ENTRY(inputChanStr_29);
+#endif
+#if (NUM_USB_CHAN_IN > 29)
+    STR_TABLE_ENTRY(inputChanStr_30);
+#endif
+#if (NUM_USB_CHAN_IN > 30)
+    STR_TABLE_ENTRY(inputChanStr_31);
+#endif
+#if (NUM_USB_CHAN_IN > 31)
+    STR_TABLE_ENTRY(inputChanStr_32);
+#endif
+
+#if (NUM_USB_CHAN_IN > 32)
+#error NUM_USB_CHAN > 32
 #endif
 
 #if defined(MIXER) && (MAX_MIX_COUNT > 0)
@@ -557,7 +643,259 @@ StringDescTable_t g_strTable =
 #endif
 
 #if (NUM_USB_CHAN_OUT > 18)
-#error NUM_USB_CHAN_OUT > 18
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 18)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_19           = "Analogue 19/SPDIF 1",
+    #else
+    .outputChanStr_19            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 17)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_19            = "Analogue 19/SPDIF 2",
+    #else
+    .outputChanStr_19            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_19            = "Analogue 19",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 19)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 19)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_20           = "Analogue 20/SPDIF 1",
+    #else
+    .outputChanStr_20            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 18)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_20            = "Analogue 20/SPDIF 2",
+    #else
+    .outputChanStr_20            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_20            = "Analogue 20",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 20)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 20)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_21           = "Analogue 21/SPDIF 1",
+    #else
+    .outputChanStr_21            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 19)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_21            = "Analogue 21/SPDIF 2",
+    #else
+    .outputChanStr_21            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_21            = "Analogue 21",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 21)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 21)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_22           = "Analogue 22/SPDIF 1",
+    #else
+    .outputChanStr_22            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 20)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_22            = "Analogue 22/SPDIF 2",
+    #else
+    .outputChanStr_22            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_22            = "Analogue 22",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 22)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 22)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_23           = "Analogue 23/SPDIF 1",
+    #else
+    .outputChanStr_23            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 21)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_23            = "Analogue 23/SPDIF 2",
+    #else
+    .outputChanStr_23            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_23            = "Analogue 23",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 23)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 23)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_24           = "Analogue 24/SPDIF 1",
+    #else
+    .outputChanStr_24            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 22)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_24            = "Analogue 24/SPDIF 2",
+    #else
+    .outputChanStr_24            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_24            = "Analogue 24",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 24)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 24)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_25           = "Analogue 25/SPDIF 1",
+    #else
+    .outputChanStr_25            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 23)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_25            = "Analogue 25/SPDIF 2",
+    #else
+    .outputChanStr_25            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_25            = "Analogue 25",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 25)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 25)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_26           = "Analogue 26/SPDIF 1",
+    #else
+    .outputChanStr_26            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 24)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_26            = "Analogue 26/SPDIF 2",
+    #else
+    .outputChanStr_26            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_26            = "Analogue 26",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 26)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 26)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_27           = "Analogue 27/SPDIF 1",
+    #else
+    .outputChanStr_27            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 25)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_27            = "Analogue 27/SPDIF 2",
+    #else
+    .outputChanStr_27            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_27            = "Analogue 27",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 27)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 28)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_28           = "Analogue 28/SPDIF 1",
+    #else
+    .outputChanStr_28            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 27)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_28            = "Analogue 28/SPDIF 2",
+    #else
+    .outputChanStr_28            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_28            = "Analogue 28",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 28)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 29)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_29           = "Analogue 29/SPDIF 1",
+    #else
+    .outputChanStr_29            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 28)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_29            = "Analogue 29/SPDIF 2",
+    #else
+    .outputChanStr_29            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_29            = "Analogue 29",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 29)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 30)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_30           = "Analogue 30/SPDIF 1",
+    #else
+    .outputChanStr_30            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 29)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_30            = "Analogue 30/SPDIF 2",
+    #else
+    .outputChanStr_30            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_30            = "Analogue 30",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 30)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 31)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_31           = "Analogue 31/SPDIF 1",
+    #else
+    .outputChanStr_31            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 30)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_31            = "Analogue 31/SPDIF 2",
+    #else
+    .outputChanStr_31            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_31            = "Analogue 31",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 31)
+#if defined(SPDIF) && (SPDIF_TX_INDEX == 32)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_32            = "Analogue 32/SPDIF 1",
+    #else
+    .outputChanStr_32            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF) && (SPDIF_TX_INDEX == 32)
+    #if(SPDIF_TX_INDEX < I2S_CHANS_DAC)
+    .outputChanStr_32            = "Analogue 32/SPDIF 2",
+    #else
+    .outputChanStr_32            = "S/PDIF 2",
+    #endif
+#else
+    .outputChanStr_32            = "Analogue 32",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_OUT > 32)
+#error NUM_USB_CHAN > 32
 #endif
 
 /*** INPUT CHANNEL STRINGS ***/
@@ -880,7 +1218,257 @@ StringDescTable_t g_strTable =
 #endif
 
 #if (NUM_USB_CHAN_IN > 18)
-#error NUM_USB_CHAN_IN > 18
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 18)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_19            = "Analogue 19/SPDIF 1",
+    #else
+    .inputChanStr_19            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 17)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_19            = "Analogue 19/SPDIF 2",
+    #else
+    .inputChanStr_19            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_19            = "Analogue 19",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 19)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 19)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_20            = "Analogue 20/SPDIF 1",
+    #else
+    .inputChanStr_20            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 18)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_20            = "Analogue 20/SPDIF 2",
+    #else
+    .inputChanStr_20            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_20            = "Analogue 20",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 20)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 20)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_21            = "Analogue 21/SPDIF 1",
+    #else
+    .inputChanStr_21            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 19)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_21            = "Analogue 21/SPDIF 2",
+    #else
+    .inputChanStr_21            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_21            = "Analogue 21",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 21)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 21)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_22            = "Analogue 22/SPDIF 1",
+    #else
+    .inputChanStr_22            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 20)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_22            = "Analogue 22/SPDIF 2",
+    #else
+    .inputChanStr_22            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_22            = "Analogue 22",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 22)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 22)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_23            = "Analogue 23/SPDIF 1",
+    #else
+    .inputChanStr_23            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 21)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_23            = "Analogue 23/SPDIF 2",
+    #else
+    .inputChanStr_23            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_23            = "Analogue 23",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 23)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 23)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_24            = "Analogue 24/SPDIF 1",
+    #else
+    .inputChanStr_24            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 22)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_24            = "Analogue 24/SPDIF 2",
+    #else
+    .inputChanStr_24            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_24            = "Analogue 24",
+#endif
+#endif
+#if (NUM_USB_CHAN_IN > 24)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 24)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_25            = "Analogue 25/SPDIF 1",
+    #else
+    .inputChanStr_25            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 23)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_25            = "Analogue 25/SPDIF 2",
+    #else
+    .inputChanStr_25            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_25            = "Analogue 25",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 25)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 25)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_26            = "Analogue 26/SPDIF 1",
+    #else
+    .inputChanStr_26            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 24)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_26            = "Analogue 26/SPDIF 2",
+    #else
+    .inputChanStr_26            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_26            = "Analogue 26",
+#endif
+#endif
+#if (NUM_USB_CHAN_IN > 26)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 26)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_27            = "Analogue 27/SPDIF 1",
+    #else
+    .inputChanStr_27            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 25)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_27            = "Analogue 27/SPDIF 2",
+    #else
+    .inputChanStr_27            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_27            = "Analogue 27",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 27)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 27)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_28            = "Analogue 28/SPDIF 1",
+    #else
+    .inputChanStr_28            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 26)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_28            = "Analogue 28/SPDIF 2",
+    #else
+    .inputChanStr_28            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_28            = "Analogue 28",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 28)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 28)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_29            = "Analogue 29/SPDIF 1",
+    #else
+    .inputChanStr_29            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 27)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_29            = "Analogue 29/SPDIF 2",
+    #else
+    .inputChanStr_29            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_29            = "Analogue 29",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 29)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 29)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_30            = "Analogue 30/SPDIF 1",
+    #else
+    .inputChanStr_30            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 28)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_30            = "Analogue 30/SPDIF 2",
+    #else
+    .inputChanStr_30            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_30            = "Analogue 30",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 30)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 30)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_31            = "Analogue 31/SPDIF 1",
+    #else
+    .inputChanStr_31            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 29)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_31            = "Analogue 31/SPDIF 2",
+    #else
+    .inputChanStr_31            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_31            = "Analogue 31",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 31)
+#if defined(SPDIF_RX) && (SPDIF_RX_INDEX == 31)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_32            = "Analogue 32/SPDIF 1",
+    #else
+    .inputChanStr_32            = "S/PDIF 1",
+    #endif
+#elif defined(SPDIF_RX) && (SPDIF_RX_INDEX == 30)
+    #if(SPDIF_RX_INDEX < I2S_CHANS_ADC)
+    .inputChanStr_32            = "Analogue 32/SPDIF 2",
+    #else
+    .inputChanStr_32            = "S/PDIF 2",
+    #endif
+#else
+    .inputChanStr_32            = "Analogue 32",
+#endif
+#endif
+
+#if (NUM_USB_CHAN_IN > 32)
+#error NUM_USB_CHAN_IN > 32
 #endif
 
 #if defined(MIXER) && (MAX_MIX_COUNT > 0)
@@ -1606,7 +2194,50 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
                 0x0000000F,         /* bmaControls(18) */
 #endif
 #if (NUM_USB_CHAN_OUT > 18)
-#error NUM_USB_CHAN_OUT > 18
+                0x0000000F,         /* bmaControls(19) */
+#endif
+#if (NUM_USB_CHAN_OUT > 19)
+                0x0000000F,         /* bmaControls(20) */
+#endif
+#if (NUM_USB_CHAN_OUT > 20)
+                0x0000000F,         /* bmaControls(21) */
+#endif
+#if (NUM_USB_CHAN_OUT > 21)
+                0x0000000F,         /* bmaControls(22) */
+#endif
+#if (NUM_USB_CHAN_OUT > 22)
+                0x0000000F,         /* bmaControls(23) */
+#endif
+#if (NUM_USB_CHAN_OUT > 23)
+                0x0000000F,         /* bmaControls(24) */
+#endif
+#if (NUM_USB_CHAN_OUT > 24)
+                0x0000000F,         /* bmaControls(25) */
+#endif
+#if (NUM_USB_CHAN_OUT > 25)
+                0x0000000F,         /* bmaControls(26) */
+#endif
+#if (NUM_USB_CHAN_OUT > 26)
+                0x0000000F,         /* bmaControls(27) */
+#endif
+#if (NUM_USB_CHAN_OUT > 27)
+                0x0000000F,         /* bmaControls(28) */
+#endif
+#if (NUM_USB_CHAN_OUT > 28)
+                0x0000000F,         /* bmaControls(29) */
+#endif
+#if (NUM_USB_CHAN_OUT > 29)
+                0x0000000F,         /* bmaControls(30) */
+#endif
+#if (NUM_USB_CHAN_OUT > 30)
+                0x0000000F,         /* bmaControls(31) */
+#endif
+#if (NUM_USB_CHAN_OUT > 31)
+                0x0000000F,         /* bmaControls(32) */
+#endif
+
+#if (NUM_USB_CHAN_OUT > 32)
+#error NUM_USB_CHAN_OUT > 32
 #endif
             },
             0,                              /* 60 iFeature */
@@ -1739,7 +2370,49 @@ USB_Config_Descriptor_Audio2_t cfgDesc_Audio2=
                 0x0000000F,         /* bmaControls(18) */
 #endif
 #if (NUM_USB_CHAN_IN > 18)
-#error NUM_USB_CHAN_IN > 18
+                0x0000000F,         /* bmaControls(19) */
+#endif
+#if (NUM_USB_CHAN_IN > 19)
+                0x0000000F,         /* bmaControls(20) */
+#endif
+#if (NUM_USB_CHAN_IN > 20)
+                0x0000000F,         /* bmaControls(21) */
+#endif
+#if (NUM_USB_CHAN_IN > 21)
+                0x0000000F,         /* bmaControls(22) */
+#endif
+#if (NUM_USB_CHAN_IN > 22)
+                0x0000000F,         /* bmaControls(23) */
+#endif
+#if (NUM_USB_CHAN_IN > 23)
+                0x0000000F,         /* bmaControls(24) */
+#endif
+#if (NUM_USB_CHAN_IN > 24)
+                0x0000000F,         /* bmaControls(25) */
+#endif
+#if (NUM_USB_CHAN_IN > 25)
+                0x0000000F,         /* bmaControls(26) */
+#endif
+#if (NUM_USB_CHAN_IN > 26)
+                0x0000000F,         /* bmaControls(27) */
+#endif
+#if (NUM_USB_CHAN_IN > 27)
+                0x0000000F,         /* bmaControls(28) */
+#endif
+#if (NUM_USB_CHAN_IN > 28)
+                0x0000000F,         /* bmaControls(29) */
+#endif
+#if (NUM_USB_CHAN_IN > 29)
+                0x0000000F,         /* bmaControls(30) */
+#endif
+#if (NUM_USB_CHAN_IN > 30)
+                0x0000000F,         /* bmaControls(31) */
+#endif
+#if (NUM_USB_CHAN_IN > 31)
+                0x0000000F,         /* bmaControls(32) */
+#endif
+#if (NUM_USB_CHAN_IN > 32)
+#error NUM_USB_CHAN_IN > 32
 #endif
             },
             0,                             /* 60 iFeature */
diff --git a/module_usb_audio/mixer/mixer.xc b/module_usb_audio/mixer/mixer.xc
index 3e7df51d..88cb10e4 100644
--- a/module_usb_audio/mixer/mixer.xc
+++ b/module_usb_audio/mixer/mixer.xc
@@ -17,10 +17,10 @@
 static unsigned int multOut_array[NUM_USB_CHAN_OUT + 1];
 static xc_ptr multOut;
 //#endif
-#ifdef IN_VOLUME_IN_MIXER
+//#ifdef IN_VOLUME_IN_MIXER
 static unsigned int multIn_array[NUM_USB_CHAN_IN + 1];
 static xc_ptr multIn;
-#endif
+//#endif
 
 #if defined (LEVEL_METER_LEDS) || defined (LEVEL_METER_HOST)
 static unsigned abs(int x)
@@ -36,9 +36,14 @@ static unsigned abs(int x)
 }
 #endif
 
-int samples_array[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT + 1]; /* One larger for an "off" channel for mixer sources" */
+static int samples_array[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT + 1]; /* One larger for an "off" channel for mixer sources" */
 xc_ptr samples;
 
+unsafe
+{
+   static int volatile * const unsafe ptr_samples = samples_array;
+}
+
 int savedsamples2[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT];
 
 int samples_to_host_map_array[NUM_USB_CHAN_IN];
@@ -155,7 +160,7 @@ static inline int doMix(xc_ptr samples, xc_ptr ptr, xc_ptr mult)
 #endif
 
 #pragma unsafe arrays
-static inline void giveSamplesToHost(chanend c, xc_ptr samples, xc_ptr ptr, xc_ptr multIn)
+static inline void GiveSamplesToHost(chanend c, xc_ptr ptr, xc_ptr multIn)
 {
 #if defined(IN_VOLUME_IN_MIXER) && defined(IN_VOLUME_AFTER_MIX)
     int mult;
@@ -164,12 +169,21 @@ static inline void giveSamplesToHost(chanend c, xc_ptr samples, xc_ptr ptr, xc_p
 #endif
 
 #pragma loop unroll
-  for (int i=0;i<NUM_USB_CHAN_IN;i++)
-  {
+    for (int i=0; i<NUM_USB_CHAN_IN; i++)
+    {
         int sample;
         int index;
+
+#if MAX_MIX_COUNT > 0
         read_via_xc_ptr_indexed(index,ptr,i);
-        read_via_xc_ptr_indexed(sample,samples,index);
+#else
+        index = i + NUM_USB_CHAN_OUT;
+#endif
+        unsafe
+        {
+            //read_via_xc_ptr_indexed(sample,samples,index);
+            sample = ptr_samples[index];
+        }
 
 #if defined(IN_VOLUME_IN_MIXER) && defined(IN_VOLUME_AFTER_MIX)
 #warning IN Vols in mixer, AFTER mix & map
@@ -183,93 +197,108 @@ static inline void giveSamplesToHost(chanend c, xc_ptr samples, xc_ptr ptr, xc_p
 #else
         outuint(c,sample);
 #endif
-
-  }
+    }
 }
 
 #pragma unsafe arrays
-static inline void getSamplesFromHost(chanend c, xc_ptr samples, int base, unsigned underflow)
+static inline void GetSamplesFromHost(chanend c, unsigned underflow)
 {
     if(!underflow)
     {
 #pragma loop unroll
-    for (int i=0;i<NUM_USB_CHAN_OUT;i++)
-    {
-        int sample, x;
+        for (int i=0; i<NUM_USB_CHAN_OUT; i++)
+        unsafe {
+            int sample, x;
 #if defined(OUT_VOLUME_IN_MIXER) && !defined(OUT_VOLUME_AFTER_MIX)
-        int mult;
-        int h;
-        unsigned l;
+            int mult;
+            int h;
+            unsigned l;
 #endif
-        /* Receive sample from decouple */
-        sample = inuint(c);
+            /* Receive sample from decouple */
+            sample = inuint(c);
 
 #if defined (LEVEL_METER_HOST) || defined(LEVEL_METER_LEDS)
-        /* Compute peak level data */
-        x = abs(sample);
-        if(x > samples_from_host_streams[i])
-        {
-            samples_from_host_streams[i] = x;
-        }
+            /* Compute peak level data */
+            x = abs(sample);
+            if(x > samples_from_host_streams[i])
+            {
+                samples_from_host_streams[i] = x;
+            }
 #endif
 
 #if defined(OUT_VOLUME_IN_MIXER) && !defined(OUT_VOLUME_AFTER_MIX)
 #warning OUT Vols in mixer, BEFORE mix & map
-        read_via_xc_ptr_indexed(mult, multOut, i);
-        {h, l} = macs(mult, sample, 0, 0);
-        h<<=3;
+            read_via_xc_ptr_indexed(mult, multOut, i);
+            {h, l} = macs(mult, sample, 0, 0);
+            h<<=3;
 #if (STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED == 1)
-        h |= (l >>29)& 0x7; // Note: This step is not required if we assume sample depth is 24bit (rather than 32bit)
+            h |= (l >>29)& 0x7; // Note: This step is not required if we assume sample depth is 24bit (rather than 32bit)
                             // Note: We need all 32bits for Native DSD
 #endif
-        write_via_xc_ptr_indexed(multOut, index, val);
-        write_via_xc_ptr_indexed(samples,base+i,h);
+            write_via_xc_ptr_indexed(multOut, index, val);
+            write_via_xc_ptr_indexed(samples_array, i, h);
 #else
-        write_via_xc_ptr_indexed(samples,base+i,sample);
+            ptr_samples[i] = sample;
 #endif
-}  }
+        }
+    }
 }
 
 #pragma unsafe arrays
-static inline void giveSamplesToDevice(chanend c, xc_ptr samples, xc_ptr ptr, xc_ptr multOut, unsigned underflow)
+static inline void GiveSamplesToDevice(chanend c, xc_ptr ptr, xc_ptr multOut, unsigned underflow)
 {
-
     outuint(c, underflow);
 
     if(!underflow)
     {
 #pragma loop unroll
-    for (int i=0;i<NUM_USB_CHAN_OUT;i++)
-    {
-        int sample,x;
+        for (int i=0; i<NUM_USB_CHAN_OUT; i++)
+        {
+            int sample, x;
 #if defined(OUT_VOLUME_IN_MIXER) && defined(OUT_VOLUME_AFTER_MIX)
-        int mult;
-        int h;
-        unsigned l;
+            int mult;
+            int h;
+            unsigned l;
+#endif
+            int index;
+
+#if MAX_MIX_COUNT > 0
+            /* If mixer turned on sort out the channel mapping */
+
+            /* Read pointer to sample from the map */
+            read_via_xc_ptr_indexed(index, ptr, i);
+
+            /* Read the actual sample value */
+            read_via_xc_ptr_indexed(sample, samples, index);
+#else
+            unsafe
+            {
+                /* Read the actual sample value */
+                sample = ptr_samples[i];
+            }
 #endif
-        int index;
-        read_via_xc_ptr_indexed(index, ptr, i);
-        read_via_xc_ptr_indexed(sample, samples, index)
 
 #if defined(OUT_VOLUME_IN_MIXER) && defined(OUT_VOLUME_AFTER_MIX)
+            /* Do volume control processing */
 #warning OUT Vols in mixer, AFTER mix & map
-        read_via_xc_ptr_indexed(mult, multOut, i);
-        {h, l} = macs(mult, sample, 0, 0);
-        h<<=3;              // Shift used to be done in audio thread but now done here incase of 32bit support
+            read_via_xc_ptr_indexed(mult, multOut, i);
+            {h, l} = macs(mult, sample, 0, 0);
+            h<<=3;              // Shift used to be done in audio thread but now done here incase of 32bit support
+#error
 #if (STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED == 1)
-        h |= (l >>29)& 0x7; // Note: This step is not required if we assume sample depth is 24bit (rather than 32bit)
+            h |= (l >>29)& 0x7; // Note: This step is not required if we assume sample depth is 24bit (rather than 32bit)
                             // Note: We need all 32bits for Native DSD
 #endif
-        outuint(c, h);
+            outuint(c, h);
 #else
-        outuint(c, sample);
+            outuint(c, sample);
 #endif
-    }
+        }
     }
 }
 
 #pragma unsafe arrays
-static inline void getSamplesFromDevice(chanend c, xc_ptr samples, int base)
+static inline void GetSamplesFromDevice(chanend c)
 {
 #if defined(IN_VOLUME_IN_MIXER) && !defined(IN_VOLUME_AFTER_MIX)
     int mult;
@@ -299,12 +328,19 @@ static inline void getSamplesFromDevice(chanend c, xc_ptr samples, int base)
 #endif
 
 #if defined(IN_VOLUME_IN_MIXER) && !defined(IN_VOLUME_AFTER_MIX)
+        /* Read relevant multiplier */
         read_via_xc_ptr_indexed(mult, multIn, i);
+
+        /* Do the multiply */
         {h, l} = macs(mult, sample, 0, 0);
         h <<=3;
-        write_via_xc_ptr_indexed(samples,base+i,h);
+        write_via_xc_ptr_indexed(samples_array, NUM_USB_CHAN_OUT+i, h);
 #else
-        write_via_xc_ptr_indexed(samples,base+i,sample);
+        /* No volume processing */
+        unsafe
+        {
+            ptr_samples[NUM_USB_CHAN_OUT + i] = sample;
+        }
 #endif
   }
 }
@@ -319,12 +355,17 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
 #endif
     unsigned cmd;
 
+    unsigned underflow = 1;
+
     while (1)
     {
 #pragma xta endpoint "mixer1_req"
         /* Request from audio() */
         inuint(c_mixer2);
 
+        GiveSamplesToDevice(c_mixer2, samples_to_device_map, multOut, underflow);
+        GetSamplesFromDevice(c_mixer2);
+
         /* Request data from decouple thread */
         outuint(c_host, 0);
 
@@ -377,7 +418,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
 #endif
                         break;
 #endif /* if MAX_MIX_COUNT > 0 */
-
 #ifdef IN_VOLUME_IN_MIXER
                     case SET_MIX_IN_VOL:
                         index = inuint(c_mix_ctl);
@@ -464,6 +504,9 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
                     sampFreq = inuint(c_host);
                     mixer1_mix2_flag = sampFreq > 96000;
 
+                    /* Wait for request */
+                    inuint(c_mixer2);
+
                     /* Inform mixer2 (or audio()) about freq change */
                     outct(c_mixer2, command);
                     outuint(c_mixer2, sampFreq);
@@ -471,7 +514,11 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
 
                 case SET_STREAM_FORMAT_OUT:
                 case SET_STREAM_FORMAT_IN:
-                     /* Inform mixer2 (or audio()) about format change */
+
+                     /* Wait for request */
+                    inuint(c_mixer2);
+
+                    /* Inform mixer2 (or audio()) about format change */
                     outct(c_mixer2, command);
                     outuint(c_mixer2, inuint(c_host));
                     outuint(c_mixer2, inuint(c_host));
@@ -482,9 +529,14 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
             }
 
 #pragma loop unroll
+            /* Reset the mix values back to 0 */
             for (int i=0;i<MAX_MIX_COUNT;i++)
             {
-              write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + i), 0);
+                //write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + i), 0);
+                unsafe
+                {
+                    ptr_samples[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + i] = 0;
+                }
             }
 
             /* Wait for handshake and pass on */
@@ -493,22 +545,22 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
         }
         else
         {
-            unsigned underflow = inuint(c_host);
+            underflow = inuint(c_host);
 #if MAX_MIX_COUNT > 0
             outuint(c_mixer2, underflow);
-            giveSamplesToHost(c_host, samples, samples_to_host_map, multIn);
+            GiveSamplesToHost(c_host, samples_to_host_map, multIn);
 
             outuint(c_mixer2, 0);
             inuint(c_mixer2);
-            getSamplesFromHost(c_host, samples, 0, underflow);
+            GetSamplesFromHost(c_host, underflow);
             outuint(c_mixer2, 0);
             inuint(c_mixer2);
 #ifdef FAST_MIXER
             mixed = doMix0(samples, mix_mult_slice(0));
 #else
-            mixed = doMix(samples,mix_map_slice(0),mix_mult_slice(0));
+            mixed = doMix(samples, mix_map_slice(0),mix_mult_slice(0));
 #endif
-            write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 0), mixed);
+            write_via_xc_ptr_indexed(samples_array, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 0), mixed);
 
 #if defined (LEVEL_METER_HOST) || defined(LEVEL_METER_LEDS)
             ComputeMixerLevel(mixed, 0);
@@ -523,9 +575,9 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
 #ifdef FAST_MIXER
               mixed = doMix2(samples, mix_mult_slice(2));
 #else
-              mixed = doMix(samples,mix_map_slice(2),mix_mult_slice(2));
+              mixed = doMix(samples, mix_map_slice(2),mix_mult_slice(2));
 #endif
-              write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 2), mixed);
+              write_via_xc_ptr_indexed(samples_array, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 2), mixed);
 
 #if defined (LEVEL_METER_HOST) || defined(LEVEL_METER_LEDS)
                 ComputeMixerLevel(mixed, 2);
@@ -536,9 +588,9 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
 #ifdef FAST_MIXER
                 mixed = doMix4(samples, mix_mult_slice(4));
 #else
-                mixed = doMix(samples,mix_map_slice(4),mix_mult_slice(4));
+                mixed = doMix(samples_array,mix_map_slice(4),mix_mult_slice(4));
 #endif
-                write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 4), mixed);
+                write_via_xc_ptr_indexed(samples_array, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 4), mixed);
 
 #if defined (LEVEL_METER_HOST) || defined(LEVEL_METER_LEDS)
                 ComputeMixerLevel(mixed, 4);
@@ -549,9 +601,9 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
 #ifdef FAST_MIXER
                 mixed = doMix6(samples, mix_mult_slice(6));
 #else
-                mixed = doMix(samples,mix_map_slice(6),mix_mult_slice(6));
+                mixed = doMix(samples_array,mix_map_slice(6),mix_mult_slice(6));
 #endif
-                write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 6), mixed);
+                write_via_xc_ptr_indexed(samples_array, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 6), mixed);
 
 #if defined (LEVEL_METER_HOST) || defined(LEVEL_METER_LEDS)
                 ComputeMixerLevel(mixed, 6);
@@ -560,10 +612,9 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
             }
 #else       /* IF MAX_MIX_COUNT > 0 */
             /* No mixes, this thread runs on its own doing just volume */
-            giveSamplesToDevice(c_mixer2, samples, samples_to_device_map, multOut, underflow);
-            getSamplesFromDevice(c_mixer2, samples, NUM_USB_CHAN_OUT);
-            giveSamplesToHost(c_host, samples, samples_to_host_map, multIn);
-            getSamplesFromHost(c_host, samples, 0, underflow);
+
+            GiveSamplesToHost(c_host, samples_to_host_map, multIn);
+            GetSamplesFromHost(c_host, underflow);
 #endif
         }
     }
@@ -628,17 +679,17 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
         else
         {
             underflow = inuint(c_mixer1);
-            giveSamplesToDevice(c_audio, samples, samples_to_device_map, multOut, underflow);
+            GiveSamplesToDevice(c_audio, samples_to_device_map, multOut, underflow);
             inuint(c_mixer1);
             outuint(c_mixer1, 0);
-            getSamplesFromDevice(c_audio, samples, NUM_USB_CHAN_OUT);
+            GetSamplesFromDevice(c_audio);
             inuint(c_mixer1);
             outuint(c_mixer1, 0);
 #if MAX_MIX_COUNT > 1
 #ifdef FAST_MIXER
       mixed = doMix1(samples, mix_mult_slice(1));
 #else
-      mixed = doMix(samples,mix_map_slice(1),mix_mult_slice(1));
+      mixed = doMix(samples_array,mix_map_slice(1),mix_mult_slice(1));
 #endif
 
       write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 1), mixed);
@@ -658,7 +709,7 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
 #ifdef FAST_MIXER
         mixed = doMix3(samples, mix_mult_slice(3));
 #else
-        mixed = doMix(samples,mix_map_slice(3),mix_mult_slice(3));
+        mixed = doMix(samples_array,mix_map_slice(3),mix_mult_slice(3));
 #endif
 
         write_via_xc_ptr_indexed(samples, (NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 3), mixed);
@@ -672,7 +723,7 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
 #ifdef FAST_MIXER
     mixed = doMix5(samples, mix_mult_slice(5));
 #else
-    mixed = doMix(samples,mix_map_slice(5),mix_mult_slice(5));
+    mixed = doMix(samples_array,mix_map_slice(5),mix_mult_slice(5));
 #endif
     write_via_xc_ptr_indexed(samples, NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 5, mixed);
 
@@ -685,10 +736,10 @@ static void mixer2(chanend c_mixer1, chanend c_audio)
 #ifdef FAST_MIXER
     mixed = doMix7(samples, mix_mult_slice(7));
 #else
-    mixed = doMix(samples,mix_map_slice(7),mix_mult_slice(7));
+    mixed = doMix(samples_array,mix_map_slice(7),mix_mult_slice(7));
 #endif
 
-    write_via_xc_ptr_indexed(samples, NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 7, mixed);
+    write_via_xc_ptr_indexed(samples,  NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + 7, mixed);
 #if defined (LEVEL_METER_HOST) || defined(LEVEL_METER_LEDS)
             ComputeMixerLevel(mixed, 7);
 #endif
@@ -707,6 +758,7 @@ void mixer(chanend c_mix_in, chanend c_mix_out, chanend c_mix_ctl)
 #endif
     multOut = array_to_xc_ptr((multOut_array,unsigned[]));
     multIn = array_to_xc_ptr((multIn_array,unsigned[]));
+
     samples = array_to_xc_ptr((samples_array,unsigned[]));
     samples_to_host_map = array_to_xc_ptr((samples_to_host_map_array,unsigned[]));
     samples_to_device_map = array_to_xc_ptr((samples_to_device_map_array,unsigned[]));
@@ -725,8 +777,9 @@ void mixer(chanend c_mix_in, chanend c_mix_out, chanend c_mix_ctl)
 #endif
 
     for (int i=0;i<NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT;i++)
-    {
-      write_via_xc_ptr_indexed(samples,i,0);
+    unsafe {
+        //write_via_xc_ptr_indexed(samples,i,0);
+        ptr_samples[i] = 0;
     }
 
     {
diff --git a/module_usb_audio/module_build_info b/module_usb_audio/module_build_info
index 4705b9d2..2872a33f 100644
--- a/module_usb_audio/module_build_info
+++ b/module_usb_audio/module_build_info
@@ -18,15 +18,15 @@
 #
 # $(call SET_XCC_C_FLAGS, mydir1 mydir2, $(XCC_FLAGS) -g -O3)
 
-
 # You can change the flags of an individual file by setting the 
 # XCC_FLAGS_[filename] variable. e.g.
 #
 # XCC_FLAGS_myfile.xc = $(XCC_FLAGS) -fsubword-select
 
-
 # You can exclude particular files from the build even if they occur
 # within SOURCE_DIRS by adding the file name (with no path) to the 
 # EXCLUDE_FILES variable e..g
 #
 EXCLUDE_FILES += descriptors_2.rst
+
+MODULE_XCC_FLAGS += $(XCC_FLAGS) -falways-inline
diff --git a/module_usb_audio/ports/audioports.c b/module_usb_audio/ports/audioports.c
index 7daf4df6..d121e711 100644
--- a/module_usb_audio/ports/audioports.c
+++ b/module_usb_audio/ports/audioports.c
@@ -40,13 +40,8 @@ void ConfigAudioPortsWrapper(
 #endif
 
 #if (I2S_CHANS_DAC != 0) || (I2S_CHANS_ADC != 0)
-#ifndef CODEC_MASTER
                 port p_lrclk,
                 port p_bclk,
-#else
-                in port p_lrclk,
-                in port p_bclk,
-#endif
 #endif
 unsigned int divide, unsigned int dsdMode)
 {
diff --git a/module_usb_audio/usb_buffer/xc_ptr.h b/module_usb_audio/usb_buffer/xc_ptr.h
index 40d64f0c..b2be0b3d 100644
--- a/module_usb_audio/usb_buffer/xc_ptr.h
+++ b/module_usb_audio/usb_buffer/xc_ptr.h
@@ -9,12 +9,11 @@ typedef unsigned int xc_ptr;
 // the xc_ptr)
 inline xc_ptr array_to_xc_ptr(const unsigned a[])
 {
-  xc_ptr x;
-  asm("mov %0, %1":"=r"(x):"r"(a));
-  return x;
+    xc_ptr x;
+    asm("mov %0, %1":"=r"(x):"r"(a));
+    return x;
 }
 
-
 #define write_via_xc_ptr_indexed(p,i,x)         asm volatile("stw %0, %1[%2]"::"r"(x),"r"(p),"r"(i))
 #define write_byte_via_xc_ptr_indexed(p,i,x)    asm volatile("st8 %0, %1[%2]"::"r"(x),"r"(p),"r"(i))
 #define write_byte_via_xc_ptr_indexed(p,i,x)    asm volatile("st8 %0, %1[%2]"::"r"(x),"r"(p),"r"(i))
diff --git a/module_usb_audio_adat/.cproject b/module_usb_audio_adat/.cproject
index e72d2d69..252164f5 100644
--- a/module_usb_audio_adat/.cproject
+++ b/module_usb_audio_adat/.cproject
@@ -156,8 +156,7 @@
 								<option id = "com.xmos.xc.compiler.option.include.paths.38879463" name="com.xmos.xc.compiler.option.include.paths" superClass="com.xmos.xc.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/include}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/src}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat}&quot;' />
 
 								</option>
@@ -270,8 +269,7 @@
 								<option id = "com.xmos.c.compiler.option.include.paths.41424664" name="com.xmos.c.compiler.option.include.paths" superClass="com.xmos.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/include}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/src}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat}&quot;' />
 
 								</option>
@@ -390,8 +388,7 @@
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/gcc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/c++/4.2.1/xcore-xmos-elf&quot;"/>
-                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/include}&quot;' />
-<listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/src}&quot;' />
+                                    <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat/src}&quot;' />
 <listOptionValue builtIn="false" value='&quot;${workspace_loc:/module_usb_audio_adat}&quot;' />
 
 								</option>
diff --git a/xpd.xml b/xpd.xml
index 50ab0e65..25a5a992 100644
--- a/xpd.xml
+++ b/xpd.xml
@@ -20,8 +20,8 @@
         </component>
         <component description = "MIDI" type = "demoCode" scope = "General Use" path = "module_usb_midi" local = "false" id = "module_usb_midi" name = "MIDI Module for USB Audio Framework">
             <board></board>
+            <componentDependency version = "6.11.0">module_queue</componentDependency>
             <componentDependency repo = "git://github.com/xcore/sc_util" version = "1.0.4">module_xassert</componentDependency>
-            <componentDependency version = "6.10.0">module_queue</componentDependency>
             <keyword>MIDI</keyword>
         </component>
     </components>
@@ -78,7 +78,10 @@
     <release parenthash = "085c444f40fd6189021b7d0bd5f131d40c0143e2" version = "6.9.0alpha0" githash = "b8819146cffb531fe9d044a78cce000da6d9c50c"></release>
     <release parenthash = "75d5b0d4574c1766113ed3781b6218a75188da94" version = "6.10.0alpha0" githash = "8f9c2b960bd0fd6b7567d51d232c13b40619b0bc"></release>
     <release parenthash = "d8939e38f70969a8312e27ac966f7a9ffe3267ee" version = "6.10.0alpha1" githash = "876e5a26068056a2cc2d52a6b543ce1f80a33e2e"></release>
-    <release parenthash = "30f610d185606bd17061581debb6693369fcbb05" version = "6.10.0alpha2"></release>
+    <release parenthash = "30f610d185606bd17061581debb6693369fcbb05" version = "6.10.0alpha2" githash = "517fe9667c43f2c5fe0d8e5dae06be716342a16a"></release>
+    <release parenthash = "38958db165ea44a8db74abd0cf294fcb466e5172" version = "6.11.0alpha0" githash = "af925d59b69833c0ec8d970b667b4164833e5d4c"></release>
+    <release parenthash = "a4af4fd0f27b117df1f6e7ff6a10299f2ea91349" version = "6.11.0alpha1" githash = "bed9f5314a0f7f2c952da24bd6efa18931b12b93"></release>
+    <release parenthash = "66ce8f8a6e982c3de563205d12e0ed10725ef8c3" version = "6.11.0alpha2"></release>
     <subpartnumber>XM-004720-SM</subpartnumber>
     <vendor>XMOS</vendor>
     <version_defines>