diff --git a/apps/fft-multi-decoder_fixed_hackrf.grc b/apps/fft-multi-decoder_fixed_hackrf.grc
index d948bbd..ec241fd 100644
--- a/apps/fft-multi-decoder_fixed_hackrf.grc
+++ b/apps/fft-multi-decoder_fixed_hackrf.grc
@@ -132,7 +132,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>48000</value>
+      <value>38000</value>
     </param>
   </block>
   <block>
@@ -303,7 +303,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>512*bb_decim</value>
+      <value>1024</value>
     </param>
   </block>
   <block>
@@ -357,7 +357,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>1024*40</value>
+      <value>1024*52</value>
     </param>
   </block>
   <block>
diff --git a/apps/ifft-RDS-decoder_hier-block.grc b/apps/ifft-RDS-decoder_hier-block.grc
index 9238abb..573cbd6 100644
--- a/apps/ifft-RDS-decoder_hier-block.grc
+++ b/apps/ifft-RDS-decoder_hier-block.grc
@@ -132,7 +132,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>48000</value>
+      <value>38000</value>
     </param>
   </block>
   <block>
@@ -147,7 +147,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(519, 3)</value>
+      <value>(359, 347)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -159,7 +159,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>240000</value>
+      <value>audio_rate*audio_decim</value>
     </param>
   </block>
   <block>
@@ -197,11 +197,11 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(646, 75)</value>
+      <value>(247, 395)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -216,6 +216,33 @@
       <value>audio_rate*audio_decim*bb_decim</value>
     </param>
   </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(335, 419)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>chan_rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>int(600e3)</value>
+    </param>
+  </block>
   <block>
     <key>variable</key>
     <param>
@@ -267,7 +294,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(327, 155)</value>
+      <value>(359, 155)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -287,7 +314,7 @@
     </param>
     <param>
       <key>quad_rate</key>
-      <value>chan_rate</value>
+      <value>2*baseband_rate</value>
     </param>
   </block>
   <block>
@@ -859,7 +886,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>512*2</value>
+      <value>512</value>
     </param>
   </block>
   <block>
@@ -1305,7 +1332,7 @@
     </param>
     <param>
       <key>omega</key>
-      <value>48000 / 2375.0</value>
+      <value>audio_rate / 2375.0</value>
     </param>
     <param>
       <key>theta</key>
@@ -2044,81 +2071,6 @@
       <value>3.14/150.0</value>
     </param>
   </block>
-  <block>
-    <key>low_pass_filter</key>
-    <param>
-      <key>beta</key>
-      <value>6.76</value>
-    </param>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>cutoff_freq</key>
-      <value>90e3</value>
-    </param>
-    <param>
-      <key>decim</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>2</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>fir_filter_ccf</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(159, 111)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>low_pass_filter_0</value>
-    </param>
-    <param>
-      <key>interp</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>chan_rate</value>
-    </param>
-    <param>
-      <key>width</key>
-      <value>30e3</value>
-    </param>
-    <param>
-      <key>win</key>
-      <value>firdes.WIN_HAMMING</value>
-    </param>
-  </block>
   <block>
     <key>multirds_pilot_SNR</key>
     <param>
@@ -2942,6 +2894,65 @@
       <value>fft_len</value>
     </param>
   </block>
+  <block>
+    <key>rational_resampler_xxx</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value>firdes.low_pass(1.0,chan_rate,250e3,50e3,firdes.WIN_HAMMING)</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>decim</key>
+      <value>chan_rate/120000</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>fbw</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(167, 135)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>rational_resampler_xxx_0</value>
+    </param>
+    <param>
+      <key>interp</key>
+      <value>baseband_rate*2/120000</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>taps</key>
+      <value></value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>ccc</value>
+    </param>
+  </block>
   <block>
     <key>root_raised_cosine_filter</key>
     <param>
@@ -3367,7 +3378,7 @@
   </connection>
   <connection>
     <source_block_id>blocks_vector_to_stream_0_0_1</source_block_id>
-    <sink_block_id>low_pass_filter_0</sink_block_id>
+    <sink_block_id>rational_resampler_xxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -3497,18 +3508,6 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>low_pass_filter_0</source_block_id>
-    <sink_block_id>analog_wfm_rcv_0_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>low_pass_filter_0</source_block_id>
-    <sink_block_id>pad_sink_0_1</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>multirds_pilot_SNR_0</source_block_id>
     <sink_block_id>pad_sink_0_0</sink_block_id>
@@ -3605,6 +3604,18 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>rational_resampler_xxx_0</source_block_id>
+    <sink_block_id>analog_wfm_rcv_0_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>rational_resampler_xxx_0</source_block_id>
+    <sink_block_id>pad_sink_0_1</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
   <connection>
     <source_block_id>root_raised_cosine_filter_0</source_block_id>
     <sink_block_id>digital_mpsk_receiver_cc_0</sink_block_id>