diff --git a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt
index a483b75..965cefc 100644
--- a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt
+++ b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt
@@ -38,7 +38,7 @@ endif()
 # Firmware version (maps to BCD_DEVICE_J.M.N in USB descriptor)
 set(FW_VER_J 1)
 set(FW_VER_M 0)
-set(FW_VER_N 2)
+set(FW_VER_N 4)
 set(FW_VERSION "v${FW_VER_J}.${FW_VER_M}.${FW_VER_N}")
 
 set(SW_USB_AUDIO_FLAGS ${EXTRA_BUILD_FLAGS} -Os
@@ -79,18 +79,20 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../../lib_dnr/lib_dnr)
 
 set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS}       -DI2S_CHANS_DAC=2
                                                         -DI2S_CHANS_ADC=2
-                                                        #-DAUDIO_CLASS=1
+                                                        -DAUDIO_CLASS=1
                                                         -DMIN_FREQ=48000
                                                         -DMAX_FREQ=48000
+                                                        -DMCLK_441=512*44100
+                                                        -DMCLK_48=512*48000
                                                         -DUAC1_MODE=1
                                                         -DF5_MUSIC_UAC1=1
                                                         #-DUSE_EX3D
                                                         -DMIXER=0
                                                         #-ldnr_50ms
                                                         #-DDNR_ENABLE=1
-                                                        -llib_ex3d_all
-                                                        #-DEQ_EN=1
-                                                        #-DEX3D_SF_NUM=3
+                                                        #-llib_ex3d_all
+                                                        -DEQ_EN=1
+                                                        -DEX3D_SF_NUM=3
                                                         -DNUM_USB_CHAN_OUT=8
                                                         -DNUM_USB_CHAN_OUT_FS=2
                                                         -DNUM_USB_CHAN_IN=2
@@ -100,14 +102,15 @@ set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS}       -DI2S_CHANS_DAC
                                                         -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=16
                                                         -DSTREAM_FORMAT_INPUT_2_RESOLUTION_BITS=16
                                                         -DSTREAM_FORMAT_INPUT_3_RESOLUTION_BITS=16
-                                                        -DNUM_EX3D_CHAN_OUT=2
+                                                        #-DNUM_EX3D_CHAN_OUT=2
                                                         -DMIN_VOLUME=0xE000
-                                                        -DINPUT_VOLUME_CONTROL=1
-                                                        -DOUTPUT_VOLUME_CONTROL=1
-                                                        #-DDEBUG_MEMORY_LOG_ENABLED=1
+                                                        -DINPUT_VOLUME_CONTROL=0
+                                                        -DOUTPUT_VOLUME_CONTROL=0
+                                                        -DDEBUG_MEMORY_LOG_ENABLED=1
                                                         -DXUA_DFU_EN=0
+                                                        -DHID_CONTROLS_UAC1=1
                                                         #-DIR_SWITCHING_MODE
-                                                        -DHID_CONTROLS=0)
+                                                        -DHID_CONTROLS=1)
 
 
 
diff --git a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc
index 72da865..291ea57 100644
--- a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc
+++ b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc
@@ -859,6 +859,7 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol,
                 debug_printf("SampRate->tile0: %uHz dsd=%u\n", new_samfreq, new_dsd_mode);
 
                 unsafe {
+#if !UAC1_MODE
                     switch (new_samfreq) {
                         case 192000:
                         case 176400:
@@ -881,6 +882,7 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol,
                             NAU88C22_REGWRITE(0x002C, 0x0082, (client interface i2c_master_if)i_i2c_client);
                             break;
                     }
+#endif
 #if 0
                     unsigned val;