2 files changed, 924 insertions, 1673 deletions
diff --git a/gr-digital/examples/ofdm/rx_ofdm.grc b/gr-digital/examples/ofdm/rx_ofdm.grc
index 24704ec40d..5a65ec8b17 100644
--- a/gr-digital/examples/ofdm/rx_ofdm.grc
+++ b/gr-digital/examples/ofdm/rx_ofdm.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Sun Oct  6 15:43:51 2013</timestamp>
+  <timestamp>Sun Oct 27 16:24:42 2013</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -64,7 +64,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>header_formatter</value>
+      <value>payload_mod</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -72,11 +72,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>digital.packet_header_ofdm(occupied_carriers, 1, "packet_len", length_tag_key)</value>
+      <value>digital.constellation_qpsk()</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(811, -1)</value>
+      <value>(663, 1)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -87,7 +87,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>length_tag_key</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -95,11 +95,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>"frame_len"</value>
+      <value>10000</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(367, -1)</value>
+      <value>(170, 65)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -110,7 +110,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>sync_word1</value>
+      <value>header_equalizer</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -118,11 +118,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>(0, 0, 0, 0, 0, 0, 0, -1.0, 0, 1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, -1.0, 0, 1.0, 0, 1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, -1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, 0, 0, 0, 0, 0)</value>
+      <value>digital.ofdm_equalizer_simpledfe(fft_len, header_mod.base(), occupied_carriers, pilot_carriers, pilot_symbols)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(313, 64)</value>
+      <value>(931, 69)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -133,7 +133,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>sync_word2</value>
+      <value>payload_equalizer</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -141,11 +141,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>(0, 0, 0, 0, 0, 1, 1, -1.0, -1, 1.0, 1, 1.0, -1, -1.0, -1, 1.0, 1, -1.0, 1, 1.0, 1, -1.0, -1, -1.0, -1, 1.0, -1, 1.0, -1, 1.0, 1, -1.0, 0, 1.0, 1, -1.0, 1, 1.0, -1, -1.0, 1, -1.0, -1, -1.0, 1, 1.0, 1, -1.0, 1, 1.0, -1, 1.0, -1, -1.0, -1, 1.0, 1, -1.0, 0, 0, 0, 0, 0, 0)</value>
+      <value>digital.ofdm_equalizer_simpledfe(fft_len, payload_mod.base(), occupied_carriers, pilot_carriers, pilot_symbols, 1)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(457, 64)</value>
+      <value>(1112, 73)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -156,7 +156,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>pilot_symbols</value>
+      <value>sync_word2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -164,11 +164,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>((1, 1, 1, -1,),)</value>
+      <value>[0j, 0j, 0j, 0j, 0j, 0j, (-1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), (1+0j), (1+0j), (1 +0j), (1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), 0j, (1+0j), (-1+0j), (1+0j), (1+0j), (1+0j), (-1+0j), (1+0j), (1+0j), (1+0j), (-1+0j), (1+0j), (1+0j), (1+0j), (1+0j), (-1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (-1+0j), 0j, 0j, 0j, 0j, 0j]</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(875, 65)</value>
+      <value>(399, 66)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -179,7 +179,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>pilot_carriers</value>
+      <value>sync_word1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -187,11 +187,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>((-21, -7, 7, 21,),)</value>
+      <value>[0., 0., 0., 0., 0., 0., 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 0., 0., 0., 0., 0.]</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(751, 64)</value>
+      <value>(255, 67)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -202,7 +202,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>occupied_carriers</value>
+      <value>fft_len</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -210,11 +210,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>(range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)</value>
+      <value>64</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(598, 64)</value>
+      <value>(301, -1)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -248,7 +248,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>payload_mod</value>
+      <value>packet_len</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -256,11 +256,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>digital.constellation_qpsk()</value>
+      <value>96</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(648, 0)</value>
+      <value>(1034, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -271,7 +271,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>fft_len</value>
+      <value>pilot_carriers</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -279,11 +279,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>64</value>
+      <value>((-21, -7, 7, 21,),)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(301, -1)</value>
+      <value>(692, 70)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -294,7 +294,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>pilot_symbols</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -302,11 +302,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>100000</value>
+      <value>((1, 1, 1, -1,),)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(218, 64)</value>
+      <value>(813, 70)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -314,22 +314,22 @@
     </param>
   </block>
   <block>
-    <key>import</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>import_1</value>
+      <value>occupied_carriers</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>import</key>
-      <value>from gnuradio.digital.utils import tagged_streams</value>
+      <key>value</key>
+      <value>(range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(163, 0)</value>
+      <value>(541, 70)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -337,22 +337,22 @@
     </param>
   </block>
   <block>
-    <key>virtual_sink</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>virtual_sink_0_0</value>
+      <value>length_tag_key</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>Payload Stream</value>
+      <key>value</key>
+      <value>"frame_len"</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(968, 374)</value>
+      <value>(367, -1)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -360,22 +360,22 @@
     </param>
   </block>
   <block>
-    <key>virtual_sink</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>virtual_sink_0</value>
+      <value>packet_length_tag_key</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>Header Stream</value>
+      <key>value</key>
+      <value>"packet_len"</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(969, 305)</value>
+      <value>(1132, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -383,26 +383,80 @@
     </param>
   </block>
   <block>
-    <key>digital_ofdm_sync_sc_cfb</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>digital_ofdm_sync_sc_cfb_0</value>
+      <value>header_formatter</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>fft_len</key>
-      <value>fft_len</value>
+      <key>value</key>
+      <value>digital.packet_header_ofdm(occupied_carriers, n_syms=1, len_tag_key=packet_length_tag_key, frame_len_tag_key=length_tag_key, bits_per_header_sym=header_mod.bits_per_symbol(), bits_per_payload_sym=payload_mod.bits_per_symbol(), scramble_header=False)</value>
     </param>
     <param>
-      <key>cp_len</key>
-      <value>fft_len/4</value>
+      <key>_coordinate</key>
+      <value>(855, 0)</value>
     </param>
     <param>
-      <key>use_even_carriers</key>
-      <value>False</value>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>import</key>
+    <param>
+      <key>id</key>
+      <value>import_1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>import</key>
+      <value>from gnuradio.digital.utils import tagged_streams</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(163, 0)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>analog_random_source_x</key>
+    <param>
+      <key>id</key>
+      <value>analog_random_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>byte</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>255</value>
+    </param>
+    <param>
+      <key>num_samps</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>repeat</key>
+      <value>True</value>
     </param>
     <param>
       <key>affinity</key>
@@ -414,7 +468,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(244, 137)</value>
+      <value>(2, 167)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -422,10 +476,41 @@
     </param>
   </block>
   <block>
-    <key>blocks_multiply_xx</key>
+    <key>analog_frequency_modulator_fc</key>
     <param>
       <key>id</key>
-      <value>blocks_multiply_xx_0</value>
+      <value>analog_frequency_modulator_fc_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>sensitivity</key>
+      <value>-2.0/fft_len</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(920, 171)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>blocks_throttle</key>
+    <param>
+      <key>id</key>
+      <value>blocks_throttle_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -436,8 +521,8 @@
       <value>complex</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>2</value>
+      <key>samples_per_second</key>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>vlen</key>
@@ -453,7 +538,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(798, 137)</value>
+      <value>(440, 187)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -496,7 +581,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(398, 235)</value>
+      <value>(637, 294)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -504,42 +589,26 @@
     </param>
   </block>
   <block>
-    <key>digital_header_payload_demux</key>
+    <key>blocks_multiply_xx</key>
     <param>
       <key>id</key>
-      <value>digital_header_payload_demux_0</value>
+      <value>blocks_multiply_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>header_len</key>
-      <value>3</value>
-    </param>
-    <param>
-      <key>items_per_symbol</key>
-      <value>fft_len</value>
-    </param>
-    <param>
-      <key>guard_interval</key>
-      <value>fft_len/4</value>
-    </param>
-    <param>
-      <key>length_tag_key</key>
-      <value>length_tag_key</value>
-    </param>
-    <param>
-      <key>trigger_tag_key</key>
-      <value>""</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>output_symbols</key>
-      <value>True</value>
+      <key>num_inputs</key>
+      <value>2</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>affinity</key>
@@ -551,7 +620,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(678, 298)</value>
+      <value>(1117, 265)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -559,37 +628,25 @@
     </param>
   </block>
   <block>
-    <key>digital_ofdm_chanest_vcvc</key>
+    <key>digital_ofdm_sync_sc_cfb</key>
     <param>
       <key>id</key>
-      <value>digital_ofdm_chanest_vcvc_1</value>
+      <value>digital_ofdm_sync_sc_cfb_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>sync_symbol1</key>
-      <value>sync_word1</value>
-    </param>
-    <param>
-      <key>sync_symbol2</key>
-      <value>sync_word2</value>
-    </param>
-    <param>
-      <key>n_data_symbols</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>eq_noise_red_len</key>
-      <value>0</value>
+      <key>fft_len</key>
+      <value>fft_len</value>
     </param>
     <param>
-      <key>max_carr_offset</key>
-      <value>-1</value>
+      <key>cp_len</key>
+      <value>fft_len/4</value>
     </param>
     <param>
-      <key>force_one_symbol</key>
+      <key>use_even_carriers</key>
       <value>False</value>
     </param>
     <param>
@@ -602,7 +659,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(453, 520)</value>
+      <value>(627, 175)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -621,7 +678,7 @@
     </param>
     <param>
       <key>header_formatter</key>
-      <value>header_formatter.formatter()</value>
+      <value>header_formatter.base()</value>
     </param>
     <param>
       <key>affinity</key>
@@ -633,18 +690,18 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(919, 501)</value>
+      <value>(634, 529)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>90</value>
+      <value>180</value>
     </param>
   </block>
   <block>
     <key>digital_constellation_decoder_cb</key>
     <param>
       <key>id</key>
-      <value>digital_constellation_decoder_cb_0_0</value>
+      <value>digital_constellation_decoder_cb_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -664,11 +721,11 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(449, 702)</value>
+      <value>(903, 530)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
   </block>
   <block>
@@ -695,7 +752,7 @@
     </param>
     <param>
       <key>window</key>
-      <value></value>
+      <value>()</value>
     </param>
     <param>
       <key>shift</key>
@@ -715,7 +772,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(223, 512)</value>
+      <value>(217, 576)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -723,10 +780,10 @@
     </param>
   </block>
   <block>
-    <key>virtual_source</key>
+    <key>virtual_sink</key>
     <param>
       <key>id</key>
-      <value>virtual_source_0</value>
+      <value>virtual_sink_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -738,7 +795,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1, 544)</value>
+      <value>(1098, 414)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -746,57 +803,30 @@
     </param>
   </block>
   <block>
-    <key>analog_frequency_modulator_fc</key>
+    <key>blocks_stream_to_tagged_stream</key>
     <param>
       <key>id</key>
-      <value>analog_frequency_modulator_fc_0</value>
+      <value>blocks_stream_to_tagged_stream_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>sensitivity</key>
-      <value>-2.0/fft_len</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(578, 133)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blocks_throttle</key>
-    <param>
-      <key>id</key>
-      <value>blocks_throttle_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>samples_per_second</key>
-      <value>samp_rate</value>
+      <key>packet_len</key>
+      <value>packet_len</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>len_tag_key</key>
+      <value>packet_length_tag_key</value>
     </param>
     <param>
       <key>affinity</key>
@@ -808,7 +838,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(186, 235)</value>
+      <value>(171, 182)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -816,42 +846,42 @@
     </param>
   </block>
   <block>
-    <key>digital_ofdm_serializer_vcc</key>
+    <key>digital_header_payload_demux</key>
     <param>
       <key>id</key>
-      <value>digital_ofdm_serializer_vcc_0</value>
+      <value>digital_header_payload_demux_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>fft_len</key>
+      <key>header_len</key>
+      <value>3</value>
+    </param>
+    <param>
+      <key>items_per_symbol</key>
       <value>fft_len</value>
     </param>
     <param>
-      <key>occupied_carriers</key>
-      <value>occupied_carriers</value>
+      <key>guard_interval</key>
+      <value>fft_len/4</value>
     </param>
     <param>
-      <key>len_tag_key</key>
+      <key>length_tag_key</key>
       <value>length_tag_key</value>
     </param>
     <param>
-      <key>packet_len_tag_key</key>
+      <key>trigger_tag_key</key>
       <value>""</value>
     </param>
     <param>
-      <key>symbols_skipped</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>carr_offset_key</key>
-      <value>""</value>
+      <key>output_symbols</key>
+      <value>True</value>
     </param>
     <param>
-      <key>input_is_shifted</key>
-      <value>True</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
       <key>affinity</key>
@@ -863,30 +893,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(187, 678)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>virtual_source</key>
-    <param>
-      <key>id</key>
-      <value>virtual_source_0_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>stream_id</key>
-      <value>Payload Stream</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(0, 814)</value>
+      <value>(775, 408)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -894,38 +901,38 @@
     </param>
   </block>
   <block>
-    <key>digital_ofdm_frame_equalizer_vcvc</key>
+    <key>digital_ofdm_chanest_vcvc</key>
     <param>
       <key>id</key>
-      <value>digital_ofdm_frame_equalizer_vcvc_0_0</value>
+      <value>digital_ofdm_chanest_vcvc_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>fft_len</key>
-      <value>fft_len</value>
+      <key>sync_symbol1</key>
+      <value>sync_word1</value>
     </param>
     <param>
-      <key>cp_len</key>
-      <value>fft_len/4</value>
+      <key>sync_symbol2</key>
+      <value>sync_word2</value>
     </param>
     <param>
-      <key>equalizer</key>
-      <value>digital.ofdm_equalizer_simpledfe(fft_len, header_mod.base(), occupied_carriers, pilot_carriers, pilot_symbols).base()</value>
+      <key>n_data_symbols</key>
+      <value>1</value>
     </param>
     <param>
-      <key>len_tag_key</key>
-      <value>length_tag_key</value>
+      <key>eq_noise_red_len</key>
+      <value>0</value>
     </param>
     <param>
-      <key>propagate_channel_state</key>
-      <value>True</value>
+      <key>max_carr_offset</key>
+      <value>3</value>
     </param>
     <param>
-      <key>fixed_frame_len</key>
-      <value>1</value>
+      <key>force_one_symbol</key>
+      <value>False</value>
     </param>
     <param>
       <key>affinity</key>
@@ -937,7 +944,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(698, 520)</value>
+      <value>(442, 584)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -945,61 +952,38 @@
     </param>
   </block>
   <block>
-    <key>blocks_tag_debug</key>
+    <key>digital_ofdm_frame_equalizer_vcvc</key>
     <param>
       <key>id</key>
-      <value>blocks_tag_debug_0</value>
+      <value>digital_ofdm_frame_equalizer_vcvc_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>name</key>
-      <value>Rx Packets</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>display</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
+      <key>fft_len</key>
+      <value>fft_len</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(904, 948)</value>
+      <key>cp_len</key>
+      <value>fft_len/4</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>equalizer</key>
+      <value>header_equalizer.base()</value>
     </param>
-  </block>
-  <block>
-    <key>digital_constellation_decoder_cb</key>
     <param>
-      <key>id</key>
-      <value>digital_constellation_decoder_cb_0</value>
+      <key>len_tag_key</key>
+      <value>length_tag_key</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>propagate_channel_state</key>
       <value>True</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>payload_mod.base()</value>
+      <key>fixed_frame_len</key>
+      <value>1</value>
     </param>
     <param>
       <key>affinity</key>
@@ -1011,7 +995,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(416, 956)</value>
+      <value>(675, 577)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1019,34 +1003,22 @@
     </param>
   </block>
   <block>
-    <key>digital_crc32_bb</key>
+    <key>virtual_source</key>
     <param>
       <key>id</key>
-      <value>digital_crc32_bb_0</value>
+      <value>virtual_source_1</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>check</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>lengthtagname</key>
-      <value>"packet_len"</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>Payload Stream</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(663, 948)</value>
+      <value>(0, 732)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1057,7 +1029,7 @@
     <key>digital_ofdm_serializer_vcc</key>
     <param>
       <key>id</key>
-      <value>digital_ofdm_serializer_vcc_1</value>
+      <value>digital_ofdm_serializer_vcc_header</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1077,7 +1049,7 @@
     </param>
     <param>
       <key>packet_len_tag_key</key>
-      <value>"packet_len"</value>
+      <value></value>
     </param>
     <param>
       <key>symbols_skipped</key>
@@ -1085,7 +1057,7 @@
     </param>
     <param>
       <key>carr_offset_key</key>
-      <value>""</value>
+      <value></value>
     </param>
     <param>
       <key>input_is_shifted</key>
@@ -1101,7 +1073,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(778, 790)</value>
+      <value>(914, 584)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1109,50 +1081,45 @@
     </param>
   </block>
   <block>
-    <key>digital_ofdm_frame_equalizer_vcvc</key>
+    <key>virtual_sink</key>
     <param>
       <key>id</key>
-      <value>digital_ofdm_frame_equalizer_vcvc_1</value>
+      <value>virtual_sink_1</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>fft_len</key>
-      <value>fft_len</value>
+      <key>stream_id</key>
+      <value>Payload Stream</value>
     </param>
     <param>
-      <key>cp_len</key>
-      <value>fft_len/4</value>
+      <key>_coordinate</key>
+      <value>(1094, 470)</value>
     </param>
     <param>
-      <key>equalizer</key>
-      <value>digital.ofdm_equalizer_simpledfe(fft_len, header_mod.base(), occupied_carriers, pilot_carriers, pilot_symbols, 2).base()</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_source</key>
     <param>
-      <key>len_tag_key</key>
-      <value>length_tag_key</value>
+      <key>id</key>
+      <value>virtual_source_0</value>
     </param>
     <param>
-      <key>propagate_channel_state</key>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>fixed_frame_len</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>Header Stream</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(474, 782)</value>
+      <value>(5, 606)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1163,7 +1130,7 @@
     <key>fft_vxx</key>
     <param>
       <key>id</key>
-      <value>fft_vxx_0_0</value>
+      <value>fft_vxx_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1203,7 +1170,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(219, 782)</value>
+      <value>(221, 702)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1211,662 +1178,342 @@
     </param>
   </block>
   <block>
-    <key>uhd_usrp_source</key>
+    <key>digital_ofdm_frame_equalizer_vcvc</key>
     <param>
       <key>id</key>
-      <value>uhd_usrp_source_0</value>
+      <value>digital_ofdm_frame_equalizer_vcvc_1</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>fc32</value>
-    </param>
-    <param>
-      <key>otw</key>
-      <value></value>
-    </param>
-    <param>
-      <key>stream_args</key>
-      <value></value>
-    </param>
-    <param>
-      <key>stream_chans</key>
-      <value>[]</value>
-    </param>
-    <param>
-      <key>dev_addr</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sync</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_rate</key>
-      <value>0.0</value>
-    </param>
-    <param>
-      <key>num_mboards</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>clock_source0</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source0</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec0</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source1</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source1</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec1</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source2</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source2</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec2</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source3</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source3</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec3</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source4</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source4</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec4</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source5</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source5</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec5</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source6</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source6</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec6</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source7</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source7</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec7</key>
-      <value></value>
-    </param>
-    <param>
-      <key>nchan</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>center_freq0</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain0</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant0</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw0</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq1</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain1</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant1</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw1</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq2</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain2</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant2</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw2</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq3</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain3</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant3</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw3</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq4</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain4</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant4</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw4</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq5</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain5</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant5</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw5</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq6</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain6</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant6</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw6</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq7</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain7</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant7</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw7</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq8</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain8</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant8</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw8</key>
-      <value>0</value>
+      <value>True</value>
     </param>
     <param>
-      <key>center_freq9</key>
-      <value>0</value>
+      <key>fft_len</key>
+      <value>fft_len</value>
     </param>
     <param>
-      <key>gain9</key>
-      <value>0</value>
+      <key>cp_len</key>
+      <value>fft_len/4</value>
     </param>
     <param>
-      <key>ant9</key>
-      <value></value>
+      <key>equalizer</key>
+      <value>payload_equalizer.base()</value>
     </param>
     <param>
-      <key>bw9</key>
-      <value>0</value>
+      <key>len_tag_key</key>
+      <value>length_tag_key</value>
     </param>
     <param>
-      <key>center_freq10</key>
-      <value>0</value>
+      <key>propagate_channel_state</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain10</key>
+      <key>fixed_frame_len</key>
       <value>0</value>
     </param>
     <param>
-      <key>ant10</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw10</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq11</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain11</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>ant11</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw11</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(672, 702)</value>
     </param>
     <param>
-      <key>center_freq12</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_sink</key>
     <param>
-      <key>gain12</key>
-      <value>0</value>
+      <key>id</key>
+      <value>virtual_sink_1_0</value>
     </param>
     <param>
-      <key>ant12</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>bw12</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>Payload IQ</value>
     </param>
     <param>
-      <key>center_freq13</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(1139, 732)</value>
     </param>
     <param>
-      <key>gain13</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_ofdm_serializer_vcc</key>
     <param>
-      <key>ant13</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw13</key>
-      <value>0</value>
+      <key>id</key>
+      <value>digital_ofdm_serializer_vcc_payload</value>
     </param>
     <param>
-      <key>center_freq14</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain14</key>
-      <value>0</value>
+      <key>fft_len</key>
+      <value>fft_len</value>
     </param>
     <param>
-      <key>ant14</key>
-      <value></value>
+      <key>occupied_carriers</key>
+      <value>occupied_carriers</value>
     </param>
     <param>
-      <key>bw14</key>
-      <value>0</value>
+      <key>len_tag_key</key>
+      <value>length_tag_key</value>
     </param>
     <param>
-      <key>center_freq15</key>
-      <value>0</value>
+      <key>packet_len_tag_key</key>
+      <value>packet_length_tag_key</value>
     </param>
     <param>
-      <key>gain15</key>
-      <value>0</value>
+      <key>symbols_skipped</key>
+      <value>1</value>
     </param>
     <param>
-      <key>ant15</key>
+      <key>carr_offset_key</key>
       <value></value>
     </param>
     <param>
-      <key>bw15</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq16</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain16</key>
-      <value>0</value>
+      <key>input_is_shifted</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ant16</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw16</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq17</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(916, 710)</value>
     </param>
     <param>
-      <key>gain17</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_crc32_bb</key>
     <param>
-      <key>ant17</key>
-      <value></value>
+      <key>id</key>
+      <value>digital_crc32_bb_0</value>
     </param>
     <param>
-      <key>bw17</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>center_freq18</key>
-      <value>0</value>
+      <key>check</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain18</key>
-      <value>0</value>
+      <key>lengthtagname</key>
+      <value>packet_length_tag_key</value>
     </param>
     <param>
-      <key>ant18</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw18</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq19</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain19</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>ant19</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(659, 841)</value>
     </param>
     <param>
-      <key>bw19</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_repack_bits_bb</key>
     <param>
-      <key>center_freq20</key>
-      <value>0</value>
+      <key>id</key>
+      <value>blocks_repack_bits_bb_0</value>
     </param>
     <param>
-      <key>gain20</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ant20</key>
-      <value></value>
+      <key>k</key>
+      <value>payload_mod.bits_per_symbol()</value>
     </param>
     <param>
-      <key>bw20</key>
-      <value>0</value>
+      <key>l</key>
+      <value>8</value>
     </param>
     <param>
-      <key>center_freq21</key>
-      <value>0</value>
+      <key>len_tag_key</key>
+      <value>packet_length_tag_key</value>
     </param>
     <param>
-      <key>gain21</key>
-      <value>0</value>
+      <key>align_output</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ant21</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw21</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq22</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(430, 826)</value>
     </param>
     <param>
-      <key>gain22</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_constellation_decoder_cb</key>
     <param>
-      <key>ant22</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw22</key>
-      <value>0</value>
+      <key>id</key>
+      <value>digital_constellation_decoder_cb_1</value>
     </param>
     <param>
-      <key>center_freq23</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain23</key>
-      <value>0</value>
+      <key>constellation</key>
+      <value>payload_mod.base()</value>
     </param>
     <param>
-      <key>ant23</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw23</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq24</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain24</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>ant24</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw24</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(183, 848)</value>
     </param>
     <param>
-      <key>center_freq25</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_source</key>
     <param>
-      <key>gain25</key>
-      <value>0</value>
+      <key>id</key>
+      <value>virtual_source_0_0</value>
     </param>
     <param>
-      <key>ant25</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>bw25</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>Payload IQ</value>
     </param>
     <param>
-      <key>center_freq26</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(1, 851)</value>
     </param>
     <param>
-      <key>gain26</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_tag_debug</key>
     <param>
-      <key>ant26</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw26</key>
-      <value>0</value>
+      <key>id</key>
+      <value>blocks_tag_debug_1</value>
     </param>
     <param>
-      <key>center_freq27</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain27</key>
-      <value>0</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>ant27</key>
-      <value></value>
+      <key>name</key>
+      <value>Rx Bytes</value>
     </param>
     <param>
-      <key>bw27</key>
-      <value>0</value>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
-      <key>center_freq28</key>
-      <value>0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>gain28</key>
-      <value>0</value>
+      <key>display</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ant28</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw28</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq29</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(898, 841)</value>
     </param>
     <param>
-      <key>gain29</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>channels_channel_model</key>
     <param>
-      <key>ant29</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw29</key>
-      <value>0</value>
+      <key>id</key>
+      <value>channels_channel_model_0</value>
     </param>
     <param>
-      <key>center_freq30</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain30</key>
-      <value>0</value>
+      <key>noise_voltage</key>
+      <value>0.1</value>
     </param>
     <param>
-      <key>ant30</key>
-      <value></value>
+      <key>freq_offset</key>
+      <value>0 * 1.0/fft_len</value>
     </param>
     <param>
-      <key>bw30</key>
-      <value>0</value>
+      <key>epsilon</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>center_freq31</key>
-      <value>0</value>
+      <key>taps</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>gain31</key>
+      <key>seed</key>
       <value>0</value>
     </param>
     <param>
-      <key>ant31</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw31</key>
-      <value>0</value>
+      <key>block_tags</key>
+      <value>True</value>
     </param>
     <param>
       <key>affinity</key>
@@ -1878,7 +1525,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(0, 93)</value>
+      <value>(303, 372)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1886,75 +1533,68 @@
     </param>
   </block>
   <block>
-    <key>analog_noise_source_x</key>
+    <key>digital_ofdm_tx</key>
     <param>
       <key>id</key>
-      <value>analog_noise_source_x_0</value>
+      <value>digital_ofdm_tx_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>fft_len</key>
+      <value>fft_len</value>
     </param>
     <param>
-      <key>noise_type</key>
-      <value>analog.GR_GAUSSIAN</value>
+      <key>cp_len</key>
+      <value>fft_len/4</value>
     </param>
     <param>
-      <key>amp</key>
-      <value>1</value>
+      <key>packet_len_key</key>
+      <value>packet_length_tag_key</value>
     </param>
     <param>
-      <key>seed</key>
-      <value>0</value>
+      <key>occupied_carriers</key>
+      <value>occupied_carriers</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>pilot_carriers</key>
+      <value>pilot_carriers</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>pilot_symbols</key>
+      <value>pilot_symbols</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(-1, 196)</value>
+      <key>sync_word1</key>
+      <value>sync_word1</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>sync_word2</key>
+      <value>sync_word2</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_file_source</key>
     <param>
-      <key>id</key>
-      <value>blocks_file_source_0</value>
+      <key>header_mod</key>
+      <value>"BPSK"</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>payload_mod</key>
+      <value>"QPSK"</value>
     </param>
     <param>
-      <key>file</key>
-      <value></value>
+      <key>rolloff</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>scramble_bits</key>
+      <value>False</value>
     </param>
     <param>
-      <key>repeat</key>
+      <key>log</key>
       <value>True</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
       <key>affinity</key>
       <value></value>
     </param>
@@ -1964,7 +1604,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(-1, 311)</value>
+      <value>(58, 327)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1972,39 +1612,33 @@
     </param>
   </block>
   <connection>
-    <source_block_id>digital_ofdm_frame_equalizer_vcvc_0_0</source_block_id>
-    <sink_block_id>digital_ofdm_serializer_vcc_0</sink_block_id>
+    <source_block_id>analog_random_source_x_0</source_block_id>
+    <sink_block_id>blocks_stream_to_tagged_stream_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>virtual_source_0</source_block_id>
-    <sink_block_id>fft_vxx_0</sink_block_id>
+    <source_block_id>blocks_stream_to_tagged_stream_0</source_block_id>
+    <sink_block_id>digital_ofdm_tx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_packet_headerparser_b_0</source_block_id>
-    <sink_block_id>digital_header_payload_demux_0</sink_block_id>
-    <source_key>header_data</source_key>
-    <sink_key>header_data</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>digital_constellation_decoder_cb_0_0</source_block_id>
-    <sink_block_id>digital_packet_headerparser_b_0</sink_block_id>
+    <source_block_id>digital_ofdm_tx_0</source_block_id>
+    <sink_block_id>channels_channel_model_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_ofdm_serializer_vcc_0</source_block_id>
-    <sink_block_id>digital_constellation_decoder_cb_0_0</sink_block_id>
+    <source_block_id>channels_channel_model_0</source_block_id>
+    <sink_block_id>blocks_throttle_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_header_payload_demux_0</source_block_id>
-    <sink_block_id>virtual_sink_0_0</sink_block_id>
-    <source_key>1</source_key>
+    <source_block_id>blocks_throttle_0</source_block_id>
+    <sink_block_id>digital_ofdm_sync_sc_cfb_0</sink_block_id>
+    <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
@@ -2014,34 +1648,34 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_throttle_0</source_block_id>
-    <sink_block_id>digital_ofdm_sync_sc_cfb_0</sink_block_id>
+    <source_block_id>digital_ofdm_sync_sc_cfb_0</source_block_id>
+    <sink_block_id>analog_frequency_modulator_fc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>uhd_usrp_source_0</source_block_id>
-    <sink_block_id>digital_ofdm_sync_sc_cfb_0</sink_block_id>
+    <source_block_id>analog_frequency_modulator_fc_0</source_block_id>
+    <sink_block_id>blocks_multiply_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_throttle_0</sink_block_id>
+    <source_block_id>blocks_multiply_xx_0</source_block_id>
+    <sink_block_id>digital_header_payload_demux_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>analog_frequency_modulator_fc_0</source_block_id>
-    <sink_block_id>blocks_multiply_xx_0</sink_block_id>
+    <source_block_id>blocks_throttle_0</source_block_id>
+    <sink_block_id>blocks_delay_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_ofdm_sync_sc_cfb_0</source_block_id>
-    <sink_block_id>analog_frequency_modulator_fc_0</sink_block_id>
+    <source_block_id>blocks_delay_0</source_block_id>
+    <sink_block_id>blocks_multiply_xx_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
   <connection>
     <source_block_id>digital_ofdm_sync_sc_cfb_0</source_block_id>
@@ -2050,80 +1684,98 @@
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_multiply_xx_0</source_block_id>
+    <source_block_id>digital_header_payload_demux_0</source_block_id>
+    <sink_block_id>virtual_sink_1</sink_block_id>
+    <source_key>1</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_packet_headerparser_b_0</source_block_id>
     <sink_block_id>digital_header_payload_demux_0</sink_block_id>
+    <source_key>header_data</source_key>
+    <sink_key>header_data</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_ofdm_chanest_vcvc_0</source_block_id>
+    <sink_block_id>digital_ofdm_frame_equalizer_vcvc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_delay_0</source_block_id>
-    <sink_block_id>blocks_multiply_xx_0</sink_block_id>
+    <source_block_id>digital_ofdm_frame_equalizer_vcvc_0</source_block_id>
+    <sink_block_id>digital_ofdm_serializer_vcc_header</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>1</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_throttle_0</source_block_id>
-    <sink_block_id>blocks_delay_0</sink_block_id>
+    <source_block_id>digital_ofdm_serializer_vcc_header</source_block_id>
+    <sink_block_id>digital_constellation_decoder_cb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>uhd_usrp_source_0</source_block_id>
-    <sink_block_id>blocks_delay_0</sink_block_id>
+    <source_block_id>digital_constellation_decoder_cb_0</source_block_id>
+    <sink_block_id>digital_packet_headerparser_b_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>fft_vxx_0</source_block_id>
-    <sink_block_id>digital_ofdm_chanest_vcvc_1</sink_block_id>
+    <sink_block_id>digital_ofdm_chanest_vcvc_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>virtual_source_0</source_block_id>
+    <sink_block_id>fft_vxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_ofdm_chanest_vcvc_1</source_block_id>
-    <sink_block_id>digital_ofdm_frame_equalizer_vcvc_0_0</sink_block_id>
+    <source_block_id>virtual_source_1</source_block_id>
+    <sink_block_id>fft_vxx_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>virtual_source_0_0</source_block_id>
-    <sink_block_id>fft_vxx_0_0</sink_block_id>
+    <source_block_id>digital_ofdm_serializer_vcc_payload</source_block_id>
+    <sink_block_id>virtual_sink_1_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_file_source_0</source_block_id>
-    <sink_block_id>blocks_throttle_0</sink_block_id>
+    <source_block_id>digital_ofdm_frame_equalizer_vcvc_1</source_block_id>
+    <sink_block_id>digital_ofdm_serializer_vcc_payload</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_constellation_decoder_cb_0</source_block_id>
-    <sink_block_id>digital_crc32_bb_0</sink_block_id>
+    <source_block_id>fft_vxx_1</source_block_id>
+    <sink_block_id>digital_ofdm_frame_equalizer_vcvc_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>digital_crc32_bb_0</source_block_id>
-    <sink_block_id>blocks_tag_debug_0</sink_block_id>
+    <sink_block_id>blocks_tag_debug_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_ofdm_serializer_vcc_1</source_block_id>
-    <sink_block_id>digital_constellation_decoder_cb_0</sink_block_id>
+    <source_block_id>blocks_repack_bits_bb_0</source_block_id>
+    <sink_block_id>digital_crc32_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>fft_vxx_0_0</source_block_id>
-    <sink_block_id>digital_ofdm_frame_equalizer_vcvc_1</sink_block_id>
+    <source_block_id>virtual_source_0_0</source_block_id>
+    <sink_block_id>digital_constellation_decoder_cb_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_ofdm_frame_equalizer_vcvc_1</source_block_id>
-    <sink_block_id>digital_ofdm_serializer_vcc_1</sink_block_id>
+    <source_block_id>digital_constellation_decoder_cb_1</source_block_id>
+    <sink_block_id>blocks_repack_bits_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-digital/examples/ofdm/tx_ofdm.grc b/gr-digital/examples/ofdm/tx_ofdm.grc
index 16312a5eca..c2995d919e 100644
--- a/gr-digital/examples/ofdm/tx_ofdm.grc
+++ b/gr-digital/examples/ofdm/tx_ofdm.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Sun Oct  6 15:44:14 2013</timestamp>
+  <timestamp>Sun Oct 27 16:23:43 2013</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -64,7 +64,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>fft_len</value>
+      <value>length_tag_key</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -72,11 +72,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>64</value>
+      <value>"packet_len"</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(181, -1)</value>
+      <value>(352, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -87,7 +87,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>length_tag_name</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -95,11 +95,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>"packet_len"</value>
+      <value>100000</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(352, 0)</value>
+      <value>(255, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -110,7 +110,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>packet_len</value>
+      <value>rolloff</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -118,11 +118,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>96</value>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(476, 0)</value>
+      <value>(898, -1)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -133,7 +133,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>header_mod</value>
+      <value>payload_mod</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -141,11 +141,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>digital.constellation_bpsk()</value>
+      <value>digital.constellation_qpsk()</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(567, 0)</value>
+      <value>(734, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -156,7 +156,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>payload_mod</value>
+      <value>header_mod</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -164,11 +164,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>digital.constellation_qpsk()</value>
+      <value>digital.constellation_bpsk()</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(734, 0)</value>
+      <value>(567, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -179,7 +179,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>rolloff</value>
+      <value>packet_len</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -187,11 +187,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>0</value>
+      <value>96</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(898, -1)</value>
+      <value>(476, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -202,7 +202,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>fft_len</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -210,11 +210,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>100000</value>
+      <value>64</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(255, 0)</value>
+      <value>(181, -1)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -225,7 +225,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>sync_word2</value>
+      <value>header_formatter</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -233,11 +233,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>(0, 0, 0, 0, 0, 1, 1, -1.0, -1, 1.0, 1, 1.0, -1, -1.0, -1, 1.0, 1, -1.0, 1, 1.0, 1, -1.0, -1, -1.0, -1, 1.0, -1, 1.0, -1, 1.0, 1, -1.0, 0, 1.0, 1, -1.0, 1, 1.0, -1, -1.0, 1, -1.0, -1, -1.0, 1, 1.0, 1, -1.0, 1, 1.0, -1, 1.0, -1, -1.0, -1, 1.0, 1, -1.0, 0, 0, 0, 0, 0, 0)</value>
+      <value>digital.packet_header_ofdm(occupied_carriers, 1, length_tag_key)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(496, 128)</value>
+      <value>(708, 64)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -248,7 +248,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>sync_word1</value>
+      <value>pilot_carriers</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -256,11 +256,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>(0, 0, 0, 0, 0, 0, 0, -1.0, 0, 1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, -1.0, 0, 1.0, 0, 1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, -1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, 1.0, 0, -1.0, 0, 1.0, 0, -1.0, 0, 0, 0, 0, 0, 0)</value>
+      <value>((-21, -7, 7, 21,),)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(352, 128)</value>
+      <value>(480, 64)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -294,7 +294,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>pilot_carriers</value>
+      <value>pilot_symbols</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -302,11 +302,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>((-21, -7, 7, 21,),)</value>
+      <value>((1, 1, 1, -1,),)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(480, 64)</value>
+      <value>(601, 64)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -317,7 +317,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>header_formatter</value>
+      <value>sync_word2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -325,11 +325,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>digital.packet_header_ofdm(occupied_carriers, 1, length_tag_name)</value>
+      <value>[0, 0, 0, 0, 0, 0, -1, -1, -1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, -1, 1, -1, 0, 1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, -1, -1, -1, -1, 0, 0, 0, 0, 0] </value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(708, 64)</value>
+      <value>(496, 128)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -340,7 +340,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>pilot_symbols</value>
+      <value>sync_word1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -348,11 +348,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>((1, 1, 1, -1,),)</value>
+      <value>[0., 0., 0., 0., 0., 0., 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 0., 0., 0., 0., 0.]</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(601, 64)</value>
+      <value>(352, 128)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -383,42 +383,22 @@
     </param>
   </block>
   <block>
-    <key>blocks_tagged_stream_mux</key>
+    <key>import</key>
     <param>
       <key>id</key>
-      <value>blocks_tagged_stream_mux_0</value>
+      <value>import_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>ninputs</key>
-      <value>2</value>
-    </param>
-    <param>
-      <key>lengthtagname</key>
-      <value>length_tag_name</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>import</key>
+      <value>import numpy</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(510, 428)</value>
+      <value>(237, 93)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -426,22 +406,22 @@
     </param>
   </block>
   <block>
-    <key>virtual_sink</key>
+    <key>import</key>
     <param>
       <key>id</key>
-      <value>virtual_sink_0_0</value>
+      <value>import_1</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>Payload Bits</value>
+      <key>import</key>
+      <value>from gnuradio.digital.utils import tagged_streams</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(746, 312)</value>
+      <value>(99, 93)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -449,22 +429,22 @@
     </param>
   </block>
   <block>
-    <key>virtual_source</key>
+    <key>import</key>
     <param>
       <key>id</key>
-      <value>virtual_source_0</value>
+      <value>import_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>Header Bits</value>
+      <key>import</key>
+      <value>import random</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(0, 384)</value>
+      <value>(3, 94)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -472,30 +452,22 @@
     </param>
   </block>
   <block>
-    <key>digital_packet_headergenerator_bb</key>
+    <key>virtual_source</key>
     <param>
       <key>id</key>
-      <value>digital_packet_headergenerator_bb_0</value>
+      <value>virtual_source_0_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>header_formatter</key>
-      <value>header_formatter.formatter()</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>Time Domain</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(514, 231)</value>
+      <value>(1, 747)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -503,42 +475,22 @@
     </param>
   </block>
   <block>
-    <key>blocks_repack_bits_bb</key>
+    <key>virtual_sink</key>
     <param>
       <key>id</key>
-      <value>blocks_repack_bits_bb_0</value>
+      <value>virtual_sink_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>k</key>
-      <value>8</value>
-    </param>
-    <param>
-      <key>l</key>
-      <value>payload_mod.bits_per_symbol()</value>
-    </param>
-    <param>
-      <key>len_tag_key</key>
-      <value>length_tag_name</value>
-    </param>
-    <param>
-      <key>align_output</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>Pre-OFDM</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(522, 289)</value>
+      <value>(745, 441)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -546,45 +498,34 @@
     </param>
   </block>
   <block>
-    <key>virtual_sink</key>
+    <key>digital_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>header_bits</value>
+      <value>digital_chunks_to_symbols_xx_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>Header Bits</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(748, 231)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>in_type</key>
+      <value>byte</value>
     </param>
-  </block>
-  <block>
-    <key>digital_crc32_bb</key>
     <param>
-      <key>id</key>
-      <value>digital_crc32_bb_0</value>
+      <key>out_type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>symbol_table</key>
+      <value>payload_mod.points()</value>
     </param>
     <param>
-      <key>check</key>
-      <value>False</value>
+      <key>dimension</key>
+      <value>1</value>
     </param>
     <param>
-      <key>lengthtagname</key>
-      <value>length_tag_name</value>
+      <key>num_ports</key>
+      <value>1</value>
     </param>
     <param>
       <key>affinity</key>
@@ -596,7 +537,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(242, 223)</value>
+      <value>(212, 450)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -604,22 +545,22 @@
     </param>
   </block>
   <block>
-    <key>import</key>
+    <key>virtual_source</key>
     <param>
       <key>id</key>
-      <value>import_0</value>
+      <value>virtual_source_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>import</key>
-      <value>import numpy</value>
+      <key>stream_id</key>
+      <value>Pre-OFDM</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(237, 93)</value>
+      <value>(0, 578)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -627,22 +568,22 @@
     </param>
   </block>
   <block>
-    <key>import</key>
+    <key>virtual_sink</key>
     <param>
       <key>id</key>
-      <value>import_1</value>
+      <value>virtual_sink_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>import</key>
-      <value>from gnuradio.digital.utils import tagged_streams</value>
+      <key>stream_id</key>
+      <value>Time Domain</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(99, 93)</value>
+      <value>(855, 578)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -650,68 +591,50 @@
     </param>
   </block>
   <block>
-    <key>import</key>
+    <key>fft_vxx</key>
     <param>
       <key>id</key>
-      <value>import_0_0</value>
+      <value>fft_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>import</key>
-      <value>import random</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(3, 94)</value>
+      <key>fft_size</key>
+      <value>fft_len</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>forward</key>
+      <value>False</value>
     </param>
-  </block>
-  <block>
-    <key>virtual_source</key>
     <param>
-      <key>id</key>
-      <value>virtual_source_0_0_0_0</value>
+      <key>window</key>
+      <value>()</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>shift</key>
       <value>True</value>
     </param>
     <param>
-      <key>stream_id</key>
-      <value>Time Domain</value>
+      <key>nthreads</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(1, 747)</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>virtual_sink</key>
-    <param>
-      <key>id</key>
-      <value>virtual_sink_0_0_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>stream_id</key>
-      <value>Pre-OFDM</value>
-    </param>
     <param>
       <key>_coordinate</key>
-      <value>(745, 441)</value>
+      <value>(414, 548)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -719,10 +642,10 @@
     </param>
   </block>
   <block>
-    <key>blocks_vector_source_x</key>
+    <key>blocks_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>blocks_vector_source_x_0</value>
+      <value>blocks_multiply_const_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -730,19 +653,11 @@
     </param>
     <param>
       <key>type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>vector</key>
-      <value>range(packet_len)</value>
-    </param>
-    <param>
-      <key>tags</key>
-      <value>tagged_streams.make_lengthtags((packet_len,), (0,), length_tag_name)</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>repeat</key>
-      <value>True</value>
+      <key>const</key>
+      <value>0.05</value>
     </param>
     <param>
       <key>vlen</key>
@@ -758,7 +673,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(0, 215)</value>
+      <value>(209, 747)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -769,7 +684,7 @@
     <key>digital_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>digital_chunks_to_symbols_xx_0_0</value>
+      <value>digital_chunks_to_symbols_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -785,7 +700,7 @@
     </param>
     <param>
       <key>symbol_table</key>
-      <value>payload_mod.points()</value>
+      <value>header_mod.points()</value>
     </param>
     <param>
       <key>dimension</key>
@@ -805,7 +720,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(212, 450)</value>
+      <value>(214, 376)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -813,34 +728,34 @@
     </param>
   </block>
   <block>
-    <key>digital_chunks_to_symbols_xx</key>
+    <key>analog_random_source_x</key>
     <param>
       <key>id</key>
-      <value>digital_chunks_to_symbols_xx_0</value>
+      <value>analog_random_source_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>in_type</key>
+      <key>type</key>
       <value>byte</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>complex</value>
+      <key>min</key>
+      <value>0</value>
     </param>
     <param>
-      <key>symbol_table</key>
-      <value>header_mod.points()</value>
+      <key>max</key>
+      <value>255</value>
     </param>
     <param>
-      <key>dimension</key>
-      <value>1</value>
+      <key>num_samps</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>num_ports</key>
-      <value>1</value>
+      <key>repeat</key>
+      <value>True</value>
     </param>
     <param>
       <key>affinity</key>
@@ -852,30 +767,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(214, 376)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>virtual_source</key>
-    <param>
-      <key>id</key>
-      <value>virtual_source_0_0_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>stream_id</key>
-      <value>Pre-OFDM</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(0, 578)</value>
+      <value>(13, 220)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -883,38 +775,30 @@
     </param>
   </block>
   <block>
-    <key>digital_ofdm_carrier_allocator_cvc</key>
+    <key>blocks_tagged_stream_mux</key>
     <param>
       <key>id</key>
-      <value>digital_ofdm_carrier_allocator_cvc_0</value>
+      <value>blocks_tagged_stream_mux_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>fft_len</key>
-      <value>fft_len</value>
-    </param>
-    <param>
-      <key>occupied_carriers</key>
-      <value>occupied_carriers</value>
-    </param>
-    <param>
-      <key>pilot_carriers</key>
-      <value>pilot_carriers</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>pilot_symbols</key>
-      <value>pilot_symbols</value>
+      <key>ninputs</key>
+      <value>2</value>
     </param>
     <param>
-      <key>sync_words</key>
-      <value>(sync_word1, sync_word2)</value>
+      <key>lengthtagname</key>
+      <value>length_tag_key</value>
     </param>
     <param>
-      <key>len_tag_key</key>
-      <value>length_tag_name</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>affinity</key>
@@ -926,7 +810,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(191, 540)</value>
+      <value>(510, 428)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -957,7 +841,7 @@
     </param>
     <param>
       <key>tagname</key>
-      <value>length_tag_name</value>
+      <value>length_tag_key</value>
     </param>
     <param>
       <key>affinity</key>
@@ -969,30 +853,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(631, 563)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>virtual_sink</key>
-    <param>
-      <key>id</key>
-      <value>virtual_sink_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>stream_id</key>
-      <value>Time Domain</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(855, 578)</value>
+      <value>(632, 564)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1000,10 +861,10 @@
     </param>
   </block>
   <block>
-    <key>fft_vxx</key>
+    <key>blocks_tag_gate</key>
     <param>
       <key>id</key>
-      <value>fft_vxx_0</value>
+      <value>blocks_tag_gate_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1014,26 +875,14 @@
       <value>complex</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>fft_len</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>forward</key>
+      <key>propagate_tags</key>
       <value>False</value>
     </param>
     <param>
-      <key>window</key>
-      <value>()</value>
-    </param>
-    <param>
-      <key>shift</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>nthreads</key>
-      <value>1</value>
-    </param>
-    <param>
       <key>affinity</key>
       <value></value>
     </param>
@@ -1043,7 +892,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(414, 548)</value>
+      <value>(372, 747)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1051,26 +900,30 @@
     </param>
   </block>
   <block>
-    <key>blocks_multiply_const_vxx</key>
+    <key>blocks_repack_bits_bb</key>
     <param>
       <key>id</key>
-      <value>blocks_multiply_const_vxx_0</value>
+      <value>blocks_repack_bits_bb_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>k</key>
+      <value>8</value>
     </param>
     <param>
-      <key>const</key>
-      <value>0.05</value>
+      <key>l</key>
+      <value>payload_mod.bits_per_symbol()</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>len_tag_key</key>
+      <value>length_tag_key</value>
+    </param>
+    <param>
+      <key>align_output</key>
+      <value>False</value>
     </param>
     <param>
       <key>affinity</key>
@@ -1082,7 +935,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(209, 747)</value>
+      <value>(710, 301)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1090,670 +943,431 @@
     </param>
   </block>
   <block>
-    <key>uhd_usrp_sink</key>
+    <key>digital_packet_headergenerator_bb</key>
     <param>
       <key>id</key>
-      <value>uhd_usrp_sink_0</value>
+      <value>digital_packet_headergenerator_bb_0</value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>fc32</value>
-    </param>
-    <param>
-      <key>otw</key>
-      <value></value>
-    </param>
-    <param>
-      <key>stream_args</key>
-      <value></value>
-    </param>
-    <param>
-      <key>stream_chans</key>
-      <value>[]</value>
-    </param>
-    <param>
-      <key>dev_addr</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sync</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_rate</key>
-      <value>0.0</value>
-    </param>
-    <param>
-      <key>num_mboards</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>clock_source0</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source0</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec0</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source1</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source1</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec1</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source2</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source2</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec2</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source3</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source3</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec3</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source4</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source4</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec4</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source5</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source5</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec5</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source6</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source6</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec6</key>
-      <value></value>
-    </param>
-    <param>
-      <key>clock_source7</key>
-      <value></value>
-    </param>
-    <param>
-      <key>time_source7</key>
-      <value></value>
-    </param>
-    <param>
-      <key>sd_spec7</key>
-      <value></value>
-    </param>
-    <param>
-      <key>nchan</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>center_freq0</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain0</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant0</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw0</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq1</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain1</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant1</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw1</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq2</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain2</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant2</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw2</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq3</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain3</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant3</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw3</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq4</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain4</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant4</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw4</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq5</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain5</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ant5</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw5</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq6</key>
-      <value>0</value>
+      <value>True</value>
     </param>
     <param>
-      <key>gain6</key>
-      <value>0</value>
+      <key>header_formatter</key>
+      <value>header_formatter.formatter()</value>
     </param>
     <param>
-      <key>ant6</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw6</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq7</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain7</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>ant7</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(703, 242)</value>
     </param>
     <param>
-      <key>bw7</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_stream_to_tagged_stream</key>
     <param>
-      <key>center_freq8</key>
-      <value>0</value>
+      <key>id</key>
+      <value>blocks_stream_to_tagged_stream_0</value>
     </param>
     <param>
-      <key>gain8</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ant8</key>
-      <value></value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>bw8</key>
-      <value>0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>center_freq9</key>
-      <value>0</value>
+      <key>packet_len</key>
+      <value>packet_len</value>
     </param>
     <param>
-      <key>gain9</key>
-      <value>0</value>
+      <key>len_tag_key</key>
+      <value>length_tag_key</value>
     </param>
     <param>
-      <key>ant9</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw9</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq10</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(193, 235)</value>
     </param>
     <param>
-      <key>gain10</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_sink</key>
     <param>
-      <key>ant10</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw10</key>
-      <value>0</value>
+      <key>id</key>
+      <value>header_bits</value>
     </param>
     <param>
-      <key>center_freq11</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain11</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>Header Bits</value>
     </param>
     <param>
-      <key>ant11</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(936, 243)</value>
     </param>
     <param>
-      <key>bw11</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_sink</key>
     <param>
-      <key>center_freq12</key>
-      <value>0</value>
+      <key>id</key>
+      <value>virtual_sink_0_0</value>
     </param>
     <param>
-      <key>gain12</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ant12</key>
-      <value></value>
+      <key>stream_id</key>
+      <value>Payload Bits</value>
     </param>
     <param>
-      <key>bw12</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(934, 324)</value>
     </param>
     <param>
-      <key>center_freq13</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_source</key>
     <param>
-      <key>gain13</key>
-      <value>0</value>
+      <key>id</key>
+      <value>virtual_source_0</value>
     </param>
     <param>
-      <key>ant13</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>bw13</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>Header Bits</value>
     </param>
     <param>
-      <key>center_freq14</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(1, 382)</value>
     </param>
     <param>
-      <key>gain14</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_tag_debug</key>
     <param>
-      <key>ant14</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw14</key>
-      <value>0</value>
+      <key>id</key>
+      <value>blocks_tag_debug_0</value>
     </param>
     <param>
-      <key>center_freq15</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain15</key>
-      <value>0</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>ant15</key>
-      <value></value>
+      <key>name</key>
+      <value>Rx'd Packets</value>
     </param>
     <param>
-      <key>bw15</key>
-      <value>0</value>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
-      <key>center_freq16</key>
-      <value>0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>gain16</key>
-      <value>0</value>
+      <key>display</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ant16</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw16</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(437, 872)</value>
     </param>
     <param>
-      <key>center_freq17</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_throttle</key>
     <param>
-      <key>gain17</key>
-      <value>0</value>
+      <key>id</key>
+      <value>blocks_throttle_0</value>
     </param>
     <param>
-      <key>ant17</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>bw17</key>
-      <value>0</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>center_freq18</key>
-      <value>0</value>
+      <key>samples_per_second</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>gain18</key>
-      <value>0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>ant18</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw18</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq19</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain19</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>ant19</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw19</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(558, 747)</value>
     </param>
     <param>
-      <key>center_freq20</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_source</key>
     <param>
-      <key>gain20</key>
-      <value>0</value>
+      <key>id</key>
+      <value>virtual_source_1</value>
     </param>
     <param>
-      <key>ant20</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>bw20</key>
-      <value>0</value>
+      <key>stream_id</key>
+      <value>Tx Signal</value>
     </param>
     <param>
-      <key>center_freq21</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(5, 879)</value>
     </param>
     <param>
-      <key>gain21</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_crc32_bb</key>
     <param>
-      <key>ant21</key>
-      <value></value>
+      <key>id</key>
+      <value>digital_crc32_bb_0</value>
     </param>
     <param>
-      <key>bw21</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>center_freq22</key>
-      <value>0</value>
+      <key>check</key>
+      <value>False</value>
     </param>
     <param>
-      <key>gain22</key>
-      <value>0</value>
+      <key>lengthtagname</key>
+      <value>length_tag_key</value>
     </param>
     <param>
-      <key>ant22</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw22</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq23</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(430, 235)</value>
     </param>
     <param>
-      <key>gain23</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_ofdm_carrier_allocator_cvc</key>
     <param>
-      <key>ant23</key>
-      <value></value>
+      <key>id</key>
+      <value>digital_ofdm_carrier_allocator_cvc_0</value>
     </param>
     <param>
-      <key>bw23</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>center_freq24</key>
-      <value>0</value>
+      <key>fft_len</key>
+      <value>fft_len</value>
     </param>
     <param>
-      <key>gain24</key>
-      <value>0</value>
+      <key>occupied_carriers</key>
+      <value>occupied_carriers</value>
     </param>
     <param>
-      <key>ant24</key>
-      <value></value>
+      <key>pilot_carriers</key>
+      <value>pilot_carriers</value>
     </param>
     <param>
-      <key>bw24</key>
-      <value>0</value>
+      <key>pilot_symbols</key>
+      <value>pilot_symbols</value>
     </param>
     <param>
-      <key>center_freq25</key>
-      <value>0</value>
+      <key>sync_words</key>
+      <value>(sync_word1, sync_word2)</value>
     </param>
     <param>
-      <key>gain25</key>
-      <value>0</value>
+      <key>len_tag_key</key>
+      <value>length_tag_key</value>
     </param>
     <param>
-      <key>ant25</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw25</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>center_freq26</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>gain26</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>ant26</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(192, 540)</value>
     </param>
     <param>
-      <key>bw26</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_ofdm_rx</key>
     <param>
-      <key>center_freq27</key>
-      <value>0</value>
+      <key>id</key>
+      <value>digital_ofdm_rx_0</value>
     </param>
     <param>
-      <key>gain27</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ant27</key>
-      <value></value>
+      <key>fft_len</key>
+      <value>fft_len</value>
     </param>
     <param>
-      <key>bw27</key>
-      <value>0</value>
+      <key>cp_len</key>
+      <value>fft_len/4</value>
     </param>
     <param>
-      <key>center_freq28</key>
-      <value>0</value>
+      <key>packet_len_key</key>
+      <value>"length"</value>
     </param>
     <param>
-      <key>gain28</key>
-      <value>0</value>
+      <key>occupied_carriers</key>
+      <value>occupied_carriers</value>
     </param>
     <param>
-      <key>ant28</key>
-      <value></value>
+      <key>pilot_carriers</key>
+      <value>pilot_carriers</value>
     </param>
     <param>
-      <key>bw28</key>
-      <value>0</value>
+      <key>pilot_symbols</key>
+      <value>pilot_symbols</value>
     </param>
     <param>
-      <key>center_freq29</key>
-      <value>0</value>
+      <key>sync_word1</key>
+      <value>sync_word1</value>
     </param>
     <param>
-      <key>gain29</key>
-      <value>0</value>
+      <key>sync_word2</key>
+      <value>sync_word2</value>
     </param>
     <param>
-      <key>ant29</key>
-      <value></value>
+      <key>header_mod</key>
+      <value>"BPSK"</value>
     </param>
     <param>
-      <key>bw29</key>
-      <value>0</value>
+      <key>payload_mod</key>
+      <value>"QPSK"</value>
     </param>
     <param>
-      <key>center_freq30</key>
-      <value>0</value>
+      <key>scramble_bits</key>
+      <value>False</value>
     </param>
     <param>
-      <key>gain30</key>
-      <value>0</value>
+      <key>log</key>
+      <value>False</value>
     </param>
     <param>
-      <key>ant30</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw30</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq31</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(193, 802)</value>
     </param>
     <param>
-      <key>gain31</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>virtual_sink</key>
     <param>
-      <key>ant31</key>
-      <value></value>
+      <key>id</key>
+      <value>virtual_sink_1</value>
     </param>
     <param>
-      <key>bw31</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>stream_id</key>
+      <value>Tx Signal</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(401, 670)</value>
+      <value>(771, 698)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1768,7 +1382,7 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>type</key>
@@ -1832,7 +1446,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(649, 718)</value>
+      <value>(773, 768)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1927,46 +1541,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(636, 832)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blocks_throttle</key>
-    <param>
-      <key>id</key>
-      <value>blocks_throttle_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>samples_per_second</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(402, 747)</value>
+      <value>(775, 862)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1992,40 +1567,52 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_crc32_bb_0</source_block_id>
-    <sink_block_id>digital_packet_headergenerator_bb_0</sink_block_id>
+    <source_block_id>digital_chunks_to_symbols_xx_0_0</source_block_id>
+    <sink_block_id>blocks_tagged_stream_mux_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>virtual_source_0_0_0_0</source_block_id>
+    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_crc32_bb_0</source_block_id>
-    <sink_block_id>blocks_repack_bits_bb_0</sink_block_id>
+    <source_block_id>virtual_source_0_0_0</source_block_id>
+    <sink_block_id>digital_ofdm_carrier_allocator_cvc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_packet_headergenerator_bb_0</source_block_id>
-    <sink_block_id>header_bits</sink_block_id>
+    <source_block_id>digital_ofdm_carrier_allocator_cvc_0</source_block_id>
+    <sink_block_id>fft_vxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_repack_bits_bb_0</source_block_id>
-    <sink_block_id>virtual_sink_0_0</sink_block_id>
+    <source_block_id>fft_vxx_0</source_block_id>
+    <sink_block_id>digital_ofdm_cyclic_prefixer_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_vector_source_x_0</source_block_id>
-    <sink_block_id>digital_crc32_bb_0</sink_block_id>
+    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
+    <sink_block_id>virtual_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_chunks_to_symbols_xx_0_0</source_block_id>
-    <sink_block_id>blocks_tagged_stream_mux_0</sink_block_id>
+    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
+    <sink_block_id>blocks_tag_gate_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>1</sink_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>blocks_tag_gate_0</source_block_id>
+    <sink_block_id>blocks_throttle_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
@@ -2034,56 +1621,68 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>virtual_source_0_0_0_0</source_block_id>
-    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
+    <source_block_id>analog_random_source_x_0</source_block_id>
+    <sink_block_id>blocks_stream_to_tagged_stream_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>blocks_throttle_0</sink_block_id>
+    <source_block_id>blocks_throttle_0</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>uhd_usrp_sink_0</sink_block_id>
+    <source_block_id>blocks_throttle_0</source_block_id>
+    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>virtual_source_0_0_0</source_block_id>
-    <sink_block_id>digital_ofdm_carrier_allocator_cvc_0</sink_block_id>
+    <source_block_id>blocks_stream_to_tagged_stream_0</source_block_id>
+    <sink_block_id>digital_crc32_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_ofdm_carrier_allocator_cvc_0</source_block_id>
-    <sink_block_id>fft_vxx_0</sink_block_id>
+    <source_block_id>digital_crc32_bb_0</source_block_id>
+    <sink_block_id>digital_packet_headergenerator_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>fft_vxx_0</source_block_id>
-    <sink_block_id>digital_ofdm_cyclic_prefixer_0</sink_block_id>
+    <source_block_id>digital_crc32_bb_0</source_block_id>
+    <sink_block_id>blocks_repack_bits_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
-    <sink_block_id>virtual_sink_0</sink_block_id>
+    <source_block_id>digital_packet_headergenerator_bb_0</source_block_id>
+    <sink_block_id>header_bits</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_throttle_0</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_block_id>blocks_repack_bits_bb_0</source_block_id>
+    <sink_block_id>virtual_sink_0_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>digital_ofdm_rx_0</source_block_id>
+    <sink_block_id>blocks_tag_debug_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>virtual_source_1</source_block_id>
+    <sink_block_id>digital_ofdm_rx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>blocks_throttle_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+    <sink_block_id>virtual_sink_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>