diff --git a/peak_det_eval.grc b/peak_det_eval.grc
index 4b24213..475b2f0 100644
--- a/peak_det_eval.grc
+++ b/peak_det_eval.grc
@@ -248,7 +248,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>15</value>
+      <value>18</value>
     </param>
   </block>
   <block>
@@ -444,7 +444,7 @@
     </param>
     <param>
       <key>width</key>
-      <value>1000</value>
+      <value>channel_rate/10</value>
     </param>
     <param>
       <key>win</key>
@@ -463,7 +463,7 @@
     </param>
     <param>
       <key>cutoff_freq</key>
-      <value>audio_rate/2</value>
+      <value>audio_rate/4</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -491,7 +491,7 @@
     </param>
     <param>
       <key>width</key>
-      <value>100</value>
+      <value>audio_rate/4/10</value>
     </param>
     <param>
       <key>win</key>
@@ -671,11 +671,11 @@
     </param>
     <param>
       <key>audio_pass</key>
-      <value>2500</value>
+      <value>5000</value>
     </param>
     <param>
       <key>audio_stop</key>
-      <value>2800</value>
+      <value>5500</value>
     </param>
     <param>
       <key>alias</key>
@@ -2249,8 +2249,12 @@
       <value>40000</value>
     </param>
     <param>
-      <key>peak_height_min</key>
-      <value>peak_thresh_dB</value>
+      <key>peak_hysteresis</key>
+      <value>3</value>
+    </param>
+    <param>
+      <key>peak_thresh</key>
+      <value>20</value>
     </param>
     <param>
       <key>vlen</key>
@@ -2324,8 +2328,12 @@
       <value>2000</value>
     </param>
     <param>
-      <key>peak_height_min</key>
-      <value>peak_thresh_dB</value>
+      <key>peak_hysteresis</key>
+      <value>3</value>
+    </param>
+    <param>
+      <key>peak_thresh</key>
+      <value>20</value>
     </param>
     <param>
       <key>vlen</key>
@@ -5312,18 +5320,18 @@
     <source_key>status</source_key>
     <sink_key>in</sink_key>
   </connection>
-  <connection>
-    <source_block_id>jay_peak_manager_0</source_block_id>
-    <sink_block_id>jay_squelch_0</sink_block_id>
-    <source_key>status</source_key>
-    <sink_key>control</sink_key>
-  </connection>
   <connection>
     <source_block_id>jay_peak_manager_0_0</source_block_id>
     <sink_block_id>jay_message_filter_0_0</sink_block_id>
     <source_key>status</source_key>
     <sink_key>in</sink_key>
   </connection>
+  <connection>
+    <source_block_id>jay_peak_manager_0_0</source_block_id>
+    <sink_block_id>jay_squelch_0</sink_block_id>
+    <source_key>status</source_key>
+    <sink_key>control</sink_key>
+  </connection>
   <connection>
     <source_block_id>jay_squelch_0</source_block_id>
     <sink_block_id>analog_agc_xx_0</sink_block_id>