diff --git a/peak_det_eval.grc b/peak_det_eval.grc
index 9b59c20..f563229 100644
--- a/peak_det_eval.grc
+++ b/peak_det_eval.grc
@@ -182,7 +182,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(184, 100)</value>
+      <value>(936, 12)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -404,6 +404,53 @@
       <value>counter_slider</value>
     </param>
   </block>
+  <block>
+    <key>variable_low_pass_filter_taps</key>
+    <param>
+      <key>beta</key>
+      <value>6.76</value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>cutoff_freq</key>
+      <value>channel_rate</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(24, 932)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>gain</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>variable_low_pass_filter_taps_0</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>width</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>win</key>
+      <value>firdes.WIN_HAMMING</value>
+    </param>
+  </block>
   <block>
     <key>variable_qtgui_check_box</key>
     <param>
@@ -487,7 +534,7 @@
     </param>
     <param>
       <key>max_gain</key>
-      <value>100</value>
+      <value>10</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -503,13 +550,68 @@
     </param>
     <param>
       <key>reference</key>
-      <value>1.0</value>
+      <value>0.8</value>
     </param>
     <param>
       <key>type</key>
       <value>float</value>
     </param>
   </block>
+  <block>
+    <key>analog_am_demod_cf</key>
+    <param>
+      <key>audio_decim</key>
+      <value>int(channel_rate/audio_rate)</value>
+    </param>
+    <param>
+      <key>audio_pass</key>
+      <value>2500</value>
+    </param>
+    <param>
+      <key>audio_stop</key>
+      <value>2800</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>chan_rate</key>
+      <value>channel_rate</value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(704, 164)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>analog_am_demod_cf_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+  </block>
   <block>
     <key>analog_noise_source_x</key>
     <param>
@@ -593,7 +695,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(112, 380)</value>
+      <value>(80, 404)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -656,7 +758,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(112, 500)</value>
+      <value>(992, 516)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -754,6 +856,69 @@
       <value>analog.GR_COS_WAVE</value>
     </param>
   </block>
+  <block>
+    <key>analog_sig_source_x</key>
+    <param>
+      <key>amp</key>
+      <value>0.02</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>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>freq</key>
+      <value>440</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(992, 636)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>analog_sig_source_x_0_0_1</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>offset</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>waveform</key>
+      <value>analog.GR_COS_WAVE</value>
+    </param>
+  </block>
   <block>
     <key>audio_sink</key>
     <param>
@@ -852,49 +1017,6 @@
       <value>1</value>
     </param>
   </block>
-  <block>
-    <key>blocks_complex_to_mag</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(712, 192)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>blocks_complex_to_mag_0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-  </block>
   <block>
     <key>blocks_complex_to_mag_squared</key>
     <param>
@@ -981,6 +1103,49 @@
       <value>N_FFT</value>
     </param>
   </block>
+  <block>
+    <key>blocks_multiply_conjugate_cc</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1208, 592)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>blocks_multiply_conjugate_cc_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+  </block>
   <block>
     <key>blocks_multiply_const_vxx</key>
     <param>
@@ -1696,7 +1861,7 @@
     </param>
     <param>
       <key>decim</key>
-      <value>100</value>
+      <value>int(samp_rate/channel_rate)</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1704,7 +1869,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(456, 308)</value>
+      <value>(480, 308)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1728,7 +1893,7 @@
     </param>
     <param>
       <key>taps</key>
-      <value>1</value>
+      <value>variable_low_pass_filter_taps_0</value>
     </param>
     <param>
       <key>type</key>
@@ -1791,7 +1956,7 @@
     </param>
     <param>
       <key>type</key>
-      <value>ccc</value>
+      <value>ccf</value>
     </param>
   </block>
   <block>
@@ -1814,7 +1979,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(880, 432)</value>
+      <value>(1152, 472)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1853,7 +2018,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(320, 176)</value>
+      <value>(352, 176)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2081,7 +2246,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(328, 232)</value>
+      <value>(360, 232)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2167,7 +2332,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1048, 160)</value>
+      <value>(1064, 160)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2190,81 +2355,6 @@
       <value>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>1500</value>
-    </param>
-    <param>
-      <key>decim</key>
-      <value>int(channel_rate/audio_rate)</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>fir_filter_ccf</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(528, 140)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain</key>
-      <value>0.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>channel_rate</value>
-    </param>
-    <param>
-      <key>width</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>win</key>
-      <value>firdes.WIN_HAMMING</value>
-    </param>
-  </block>
   <block>
     <key>qtgui_freq_sink_x</key>
     <param>
@@ -2273,7 +2363,7 @@
     </param>
     <param>
       <key>average</key>
-      <value>1.0</value>
+      <value>0.2</value>
     </param>
     <param>
       <key>axislabels</key>
@@ -2281,7 +2371,7 @@
     </param>
     <param>
       <key>bw</key>
-      <value>audio_rate</value>
+      <value>channel_rate</value>
     </param>
     <param>
       <key>alias</key>
@@ -2305,15 +2395,15 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>1</value>
+      <value>True</value>
     </param>
     <param>
       <key>fftsize</key>
-      <value>N_FFT</value>
+      <value>1024</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1056, 44)</value>
+      <value>(1264, 56)</value>
     </param>
     <param>
       <key>gui_hint</key>
@@ -2505,7 +2595,7 @@
     </param>
     <param>
       <key>name</key>
-      <value>""</value>
+      <value>"Tuned"</value>
     </param>
     <param>
       <key>nconnections</key>
@@ -2513,7 +2603,7 @@
     </param>
     <param>
       <key>showports</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>freqhalf</key>
@@ -2541,7 +2631,7 @@
     </param>
     <param>
       <key>update_time</key>
-      <value>0.05</value>
+      <value>0.10</value>
     </param>
     <param>
       <key>wintype</key>
@@ -2553,11 +2643,11 @@
     </param>
     <param>
       <key>ymax</key>
-      <value>0</value>
+      <value>10</value>
     </param>
     <param>
       <key>ymin</key>
-      <value>-120</value>
+      <value>-140</value>
     </param>
     <param>
       <key>units</key>
@@ -3334,7 +3424,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(320, 84)</value>
+      <value>(312, 84)</value>
     </param>
     <param>
       <key>gui_hint</key>
@@ -4866,6 +4956,12 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>analog_am_demod_cf_0</source_block_id>
+    <sink_block_id>dc_blocker_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
   <connection>
     <source_block_id>analog_noise_source_x_0</source_block_id>
     <sink_block_id>blocks_add_xx_0</sink_block_id>
@@ -4880,9 +4976,9 @@
   </connection>
   <connection>
     <source_block_id>analog_sig_source_x_0_0</source_block_id>
-    <sink_block_id>blocks_add_xx_0</sink_block_id>
+    <sink_block_id>blocks_multiply_conjugate_cc_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>2</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>analog_sig_source_x_0_0_0</source_block_id>
@@ -4890,6 +4986,12 @@
     <source_key>0</source_key>
     <sink_key>3</sink_key>
   </connection>
+  <connection>
+    <source_block_id>analog_sig_source_x_0_0_1</source_block_id>
+    <sink_block_id>blocks_multiply_conjugate_cc_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
   <connection>
     <source_block_id>blocks_add_xx_0</source_block_id>
     <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
@@ -4908,12 +5010,6 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>blocks_complex_to_mag_0</source_block_id>
-    <sink_block_id>dc_blocker_xx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>blocks_complex_to_mag_squared_0</source_block_id>
     <sink_block_id>blocks_nlog10_ff_0</sink_block_id>
@@ -4926,6 +5022,12 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>blocks_multiply_conjugate_cc_0</source_block_id>
+    <sink_block_id>blocks_add_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>2</sink_key>
+  </connection>
   <connection>
     <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
     <sink_block_id>blocks_stream_to_vector_decimator_0</sink_block_id>
@@ -5018,7 +5120,13 @@
   </connection>
   <connection>
     <source_block_id>freq_xlating_fir_filter_xxx_0_0</source_block_id>
-    <sink_block_id>low_pass_filter_0</sink_block_id>
+    <sink_block_id>analog_am_demod_cf_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>freq_xlating_fir_filter_xxx_0_0</source_block_id>
+    <sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -5034,6 +5142,12 @@
     <source_key>out</source_key>
     <sink_key>freq</sink_key>
   </connection>
+  <connection>
+    <source_block_id>jay_message_filter_0_0</source_block_id>
+    <sink_block_id>jay_message_debug_0</sink_block_id>
+    <source_key>out</source_key>
+    <sink_key>control</sink_key>
+  </connection>
   <connection>
     <source_block_id>jay_peak_detect_1</source_block_id>
     <sink_block_id>blocks_vector_to_stream_0</sink_block_id>
@@ -5070,12 +5184,6 @@
     <source_key>status</source_key>
     <sink_key>control</sink_key>
   </connection>
-  <connection>
-    <source_block_id>jay_peak_manager_0</source_block_id>
-    <sink_block_id>jay_message_debug_0</sink_block_id>
-    <source_key>status</source_key>
-    <sink_key>control</sink_key>
-  </connection>
   <connection>
     <source_block_id>jay_peak_manager_0</source_block_id>
     <sink_block_id>jay_message_filter_0</sink_block_id>
@@ -5100,18 +5208,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>blocks_complex_to_mag_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>qtgui_freq_sink_x_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>uhd_usrp_source_1</source_block_id>
     <sink_block_id>blocks_add_xx_0</sink_block_id>