Merge branch 'master' into next

author: Johnathan Corgan <johnathan@corganlabs.com> 2016-08-31 12:28:44 -0700
committer: Johnathan Corgan <johnathan@corganlabs.com> 2016-08-31 12:28:44 -0700
commit: e66d243be4043d8870affc6fe5036bfae0d5163b (patch)
tree: ce428f62ac728b72cf56570af1fb4b8dbe9ea1d3 /gr-dtv
parent: a7a57791d452fb2543de178ae72cfd63581bf80e (diff)
parent: bb8a76f7f95bb95aeff0f3d96f50e70fcb22c7ea (diff)
29 files changed, 5322 insertions, 4713 deletions
diff --git a/gr-dtv/examples/dvbt_tx_2k.grc b/gr-dtv/examples/dvbt_tx_2k.grc
index 3db36aedcf..d570b6630c 100644
--- a/gr-dtv/examples/dvbt_tx_2k.grc
+++ b/gr-dtv/examples/dvbt_tx_2k.grc
@@ -1,460 +1,439 @@
-<?xml version='1.0' encoding='ASCII'?>
-<?grc format='1' created='3.7.8'?>
+<?xml version='1.0' encoding='utf-8'?>
+<?grc format='1' created='3.7.11'?>
 <flow_graph>
   <timestamp>Thu Jan 16 23:00:58 2014</timestamp>
   <block>
-    <key>dtv_dvbt_bit_inner_interleaver</key>
+    <key>options</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_bit_inner_interleaver_0</value>
+      <key>author</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>window_size</key>
+      <value>1280, 1024</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>64qam</value>
+      <key>category</key>
+      <value>Custom</value>
     </param>
     <param>
-      <key>hierarchy</key>
-      <value>nh</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>transmission_mode</key>
-      <value>T2k</value>
+      <key>description</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(8, 12)</value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>generate_options</key>
+      <value>qt_gui</value>
+    </param>
+    <param>
+      <key>hier_block_src_path</key>
+      <value>.:</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>dvbt_tx_demo</value>
+    </param>
+    <param>
+      <key>max_nouts</key>
       <value>0</value>
     </param>
     <param>
-      <key>comment</key>
+      <key>qt_qss_theme</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(984, 243)</value>
+      <key>realtime_scheduling</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>180</value>
+      <key>run_command</key>
+      <value>{python} -u {filename}</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>samp_rate</value>
+      <key>run_options</key>
+      <value>prompt</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>run</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>(8000000.0 * 8) / 7</value>
+      <key>thread_safe_setters</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>title</key>
       <value></value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
       <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(8, 83)</value>
+      <value>(8, 76)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_symbol_inner_interleaver</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt_symbol_inner_interleaver_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>transmission_mode</key>
-      <value>T2k</value>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>direction</key>
-      <value>Interleave</value>
+      <key>value</key>
+      <value>(8000000.0 * 8) / 7</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_file_source</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>file</key>
+      <value>/run/shm/advtest.ts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(664, 243)</value>
+      <value>(120, 76)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>qtgui_const_sink_x</key>
     <param>
       <key>id</key>
-      <value>qtgui_const_sink_x_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <value>blocks_file_source_0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>name</key>
-      <value>""</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>size</key>
-      <value>1024</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>grid</key>
-      <value>False</value>
+      <key>repeat</key>
+      <value>True</value>
     </param>
     <param>
-      <key>autoscale</key>
-      <value>False</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_multiply_const_xx</key>
     <param>
-      <key>ymin</key>
-      <value>-2</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>ymax</key>
-      <value>2</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>xmin</key>
-      <value>-2</value>
+      <key>const</key>
+      <value>0.0022097087</value>
     </param>
     <param>
-      <key>xmax</key>
-      <value>2</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>nconnections</key>
-      <value>1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>update_time</key>
-      <value>0.10</value>
+      <key>_coordinate</key>
+      <value>(696, 388)</value>
     </param>
     <param>
-      <key>gui_hint</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>tr_mode</key>
-      <value>qtgui.TRIG_MODE_FREE</value>
+      <key>id</key>
+      <value>blocks_multiply_const_xx_0</value>
     </param>
     <param>
-      <key>tr_slope</key>
-      <value>qtgui.TRIG_SLOPE_POS</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>tr_level</key>
-      <value>0.0</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>tr_chan</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>tr_tag</key>
-      <value>""</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_vector_to_stream</key>
     <param>
-      <key>legend</key>
-      <value>True</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>label1</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>width1</key>
-      <value>1</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>color1</key>
-      <value>"blue"</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>style1</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(120, 500)</value>
     </param>
     <param>
-      <key>marker1</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>alpha1</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>label2</key>
-      <value></value>
-    </param>
-    <param>
-      <key>width2</key>
-      <value>1</value>
+      <key>id</key>
+      <value>blocks_vector_to_stream_0</value>
     </param>
     <param>
-      <key>color2</key>
-      <value>"red"</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>style2</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>marker2</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>alpha2</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>label3</key>
-      <value></value>
+      <key>num_items</key>
+      <value>2048</value>
     </param>
     <param>
-      <key>width3</key>
+      <key>vlen</key>
       <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
-      <key>color3</key>
-      <value>"red"</value>
-    </param>
-    <param>
-      <key>style3</key>
-      <value>0</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>marker3</key>
-      <value>0</value>
+      <key>cp_len</key>
+      <value>64</value>
     </param>
     <param>
-      <key>alpha3</key>
-      <value>1.0</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>label4</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>width4</key>
-      <value>1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>color4</key>
-      <value>"red"</value>
+      <key>input_size</key>
+      <value>2048</value>
     </param>
     <param>
-      <key>style4</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(392, 368)</value>
     </param>
     <param>
-      <key>marker4</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>alpha4</key>
-      <value>1.0</value>
+      <key>id</key>
+      <value>digital_ofdm_cyclic_prefixer_0</value>
     </param>
     <param>
-      <key>label5</key>
+      <key>tagname</key>
       <value></value>
     </param>
     <param>
-      <key>width5</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>color5</key>
-      <value>"red"</value>
-    </param>
-    <param>
-      <key>style5</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>marker5</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>alpha5</key>
-      <value>1.0</value>
+      <key>rolloff</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_bit_inner_interleaver</key>
     <param>
-      <key>label6</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>width6</key>
-      <value>1</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>color6</key>
-      <value>"red"</value>
+      <key>constellation</key>
+      <value>64qam</value>
     </param>
     <param>
-      <key>style6</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>marker6</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>alpha6</key>
-      <value>1.0</value>
+      <key>_coordinate</key>
+      <value>(984, 204)</value>
     </param>
     <param>
-      <key>label7</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>180</value>
     </param>
     <param>
-      <key>width7</key>
-      <value>1</value>
+      <key>hierarchy</key>
+      <value>nh</value>
     </param>
     <param>
-      <key>color7</key>
-      <value>"red"</value>
+      <key>id</key>
+      <value>dtv_dvbt_bit_inner_interleaver_0</value>
     </param>
     <param>
-      <key>style7</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>marker7</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>alpha7</key>
-      <value>1.0</value>
+      <key>transmission_mode</key>
+      <value>T2k</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_convolutional_interleaver</key>
     <param>
-      <key>label8</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>width8</key>
-      <value>1</value>
+      <key>blocks</key>
+      <value>136</value>
     </param>
     <param>
-      <key>color8</key>
-      <value>"red"</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>style8</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>marker8</key>
-      <value>0</value>
+      <key>M</key>
+      <value>17</value>
     </param>
     <param>
-      <key>alpha8</key>
-      <value>1.0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>label9</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(776, 52)</value>
     </param>
     <param>
-      <key>width9</key>
-      <value>1</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>color9</key>
-      <value>"red"</value>
+      <key>id</key>
+      <value>dtv_dvbt_convolutional_interleaver_0</value>
     </param>
     <param>
-      <key>style9</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>marker9</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>alpha9</key>
-      <value>1.0</value>
+      <key>I</key>
+      <value>12</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_energy_dispersal</key>
     <param>
-      <key>label10</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>width10</key>
+      <key>nsize</key>
       <value>1</value>
     </param>
     <param>
-      <key>color10</key>
-      <value>"red"</value>
-    </param>
-    <param>
-      <key>style10</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>marker10</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>alpha10</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -462,827 +441,772 @@
       <value></value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(360, 555)</value>
+      <value>(336, 72)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_vector_to_stream</key>
     <param>
       <key>id</key>
-      <value>blocks_vector_to_stream_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
+      <value>dtv_dvbt_energy_dispersal_0</value>
     </param>
     <param>
-      <key>num_items</key>
-      <value>2048</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_inner_coder</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>code_rate</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>constellation</key>
+      <value>64qam</value>
     </param>
     <param>
-      <key>comment</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(120, 563)</value>
+      <value>(1032, 48)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_energy_dispersal</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_energy_dispersal_0</value>
+      <key>hierarchy</key>
+      <value>nh</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>id</key>
+      <value>dtv_dvbt_inner_coder_0</value>
     </param>
     <param>
-      <key>nsize</key>
+      <key>ninput</key>
       <value>1</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>noutput</key>
+      <value>1512</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_map</key>
     <param>
-      <key>comment</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(328, 96)</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>constellation</key>
+      <value>64qam</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_reed_solomon_enc</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_reed_solomon_enc_0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>p</key>
-      <value>2</value>
+      <key>_coordinate</key>
+      <value>(368, 192)</value>
     </param>
     <param>
-      <key>m</key>
-      <value>8</value>
+      <key>_rotation</key>
+      <value>180</value>
     </param>
     <param>
-      <key>gfpoly</key>
-      <value>0x11d</value>
+      <key>gain</key>
+      <value>1</value>
     </param>
     <param>
-      <key>n</key>
-      <value>255</value>
+      <key>hierarchy</key>
+      <value>nh</value>
     </param>
     <param>
-      <key>k</key>
-      <value>239</value>
+      <key>id</key>
+      <value>dtv_dvbt_map_0</value>
     </param>
     <param>
-      <key>t</key>
-      <value>8</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>s</key>
-      <value>51</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>blocks</key>
-      <value>8</value>
+      <key>transmission_mode</key>
+      <value>T2k</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_reed_solomon_enc</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>blocks</key>
+      <value>8</value>
+    </param>
+    <param>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>gfpoly</key>
+      <value>0x11d</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(512, 43)</value>
+      <value>(536, 24)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_convolutional_interleaver</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt_convolutional_interleaver_0</value>
+      <value>dtv_dvbt_reed_solomon_enc_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>k</key>
+      <value>239</value>
     </param>
     <param>
-      <key>blocks</key>
-      <value>136</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>I</key>
-      <value>12</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>M</key>
-      <value>17</value>
+      <key>n</key>
+      <value>255</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>s</key>
+      <value>51</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>m</key>
+      <value>8</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>p</key>
+      <value>2</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>t</key>
+      <value>8</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_reference_signals</key>
     <param>
-      <key>comment</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(736, 75)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
+      <key>cell_id</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_inner_coder</key>
-    <param>
-      <key>id</key>
-      <value>dtv_dvbt_inner_coder_0</value>
-    </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>code_rate_hp</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>ninput</key>
-      <value>1</value>
+      <key>code_rate_lp</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>noutput</key>
-      <value>1512</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
       <key>constellation</key>
       <value>64qam</value>
     </param>
     <param>
-      <key>hierarchy</key>
-      <value>nh</value>
-    </param>
-    <param>
-      <key>code_rate</key>
-      <value>C2_3</value>
-    </param>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1000, 67)</value>
+      <value>(48, 156)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_map</key>
-    <param>
-      <key>id</key>
-      <value>dtv_dvbt_map_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <value>180</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>64qam</value>
+      <key>guard_interval</key>
+      <value>GI_1_32</value>
     </param>
     <param>
       <key>hierarchy</key>
       <value>nh</value>
     </param>
     <param>
-      <key>transmission_mode</key>
-      <value>T2k</value>
+      <key>id</key>
+      <value>dtv_dvbt_reference_signals_0</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>1</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>include_cell_id</key>
+      <value>call_id_yes</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>transmission_mode</key>
+      <value>T2k</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_symbol_inner_interleaver</key>
     <param>
-      <key>comment</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(344, 227)</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>180</value>
+      <key>affinity</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>fft_vxx</key>
     <param>
-      <key>id</key>
-      <value>fft_vxx_0</value>
+      <key>direction</key>
+      <value>Interleave</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>_coordinate</key>
+      <value>(672, 204)</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>2048</value>
+      <key>_rotation</key>
+      <value>180</value>
     </param>
     <param>
-      <key>forward</key>
-      <value>False</value>
+      <key>id</key>
+      <value>dtv_dvbt_symbol_inner_interleaver_0</value>
     </param>
     <param>
-      <key>window</key>
-      <value>window.rectangular(2048)</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>shift</key>
-      <value>True</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>nthreads</key>
-      <value>1</value>
+      <key>transmission_mode</key>
+      <value>T2k</value>
     </param>
+  </block>
+  <block>
+    <key>fft_vxx</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>fft_size</key>
+      <value>2048</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>forward</key>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(64, 403)</value>
+      <value>(88, 360)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_file_source</key>
     <param>
       <key>id</key>
-      <value>blocks_file_source_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>file</key>
-      <value>/run/shm/advtest.ts</value>
+      <value>fft_vxx_0</value>
     </param>
     <param>
       <key>type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>repeat</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
+      <value>complex</value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>nthreads</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(112, 83)</value>
+      <key>shift</key>
+      <value>True</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>window</key>
+      <value>window.rectangular(2048)</value>
     </param>
   </block>
   <block>
-    <key>uhd_usrp_sink</key>
+    <key>qtgui_const_sink_x</key>
     <param>
-      <key>id</key>
-      <value>uhd_usrp_sink_0</value>
+      <key>autoscale</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>axislabels</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>fc32</value>
-    </param>
-    <param>
-      <key>otw</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>stream_args</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>stream_chans</key>
-      <value>[]</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>dev_addr</key>
-      <value>"send_frame_size=65536,num_send_frames=128,master_clock_rate=" + str(samp_rate*4)</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>dev_args</key>
-      <value>""</value>
+      <key>_coordinate</key>
+      <value>(360, 492)</value>
     </param>
     <param>
-      <key>sync</key>
+      <key>gui_hint</key>
       <value></value>
     </param>
     <param>
-      <key>clock_rate</key>
-      <value>0.0</value>
-    </param>
-    <param>
-      <key>num_mboards</key>
-      <value>1</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>clock_source0</key>
-      <value></value>
+      <key>grid</key>
+      <value>False</value>
     </param>
     <param>
-      <key>time_source0</key>
-      <value></value>
+      <key>id</key>
+      <value>qtgui_const_sink_x_0</value>
     </param>
     <param>
-      <key>sd_spec0</key>
-      <value></value>
+      <key>legend</key>
+      <value>True</value>
     </param>
     <param>
-      <key>clock_source1</key>
-      <value></value>
+      <key>alpha1</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>time_source1</key>
-      <value></value>
+      <key>color1</key>
+      <value>"blue"</value>
     </param>
     <param>
-      <key>sd_spec1</key>
+      <key>label1</key>
       <value></value>
     </param>
     <param>
-      <key>clock_source2</key>
-      <value></value>
+      <key>marker1</key>
+      <value>0</value>
     </param>
     <param>
-      <key>time_source2</key>
-      <value></value>
+      <key>style1</key>
+      <value>0</value>
     </param>
     <param>
-      <key>sd_spec2</key>
-      <value></value>
+      <key>width1</key>
+      <value>1</value>
     </param>
     <param>
-      <key>clock_source3</key>
-      <value></value>
+      <key>alpha10</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>time_source3</key>
-      <value></value>
+      <key>color10</key>
+      <value>"red"</value>
     </param>
     <param>
-      <key>sd_spec3</key>
+      <key>label10</key>
       <value></value>
     </param>
     <param>
-      <key>clock_source4</key>
-      <value></value>
+      <key>marker10</key>
+      <value>0</value>
     </param>
     <param>
-      <key>time_source4</key>
-      <value></value>
+      <key>style10</key>
+      <value>0</value>
     </param>
     <param>
-      <key>sd_spec4</key>
-      <value></value>
+      <key>width10</key>
+      <value>1</value>
     </param>
     <param>
-      <key>clock_source5</key>
-      <value></value>
+      <key>alpha2</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>time_source5</key>
-      <value></value>
+      <key>color2</key>
+      <value>"red"</value>
     </param>
     <param>
-      <key>sd_spec5</key>
+      <key>label2</key>
       <value></value>
     </param>
     <param>
-      <key>clock_source6</key>
-      <value></value>
+      <key>marker2</key>
+      <value>0</value>
     </param>
     <param>
-      <key>time_source6</key>
-      <value></value>
+      <key>style2</key>
+      <value>0</value>
     </param>
     <param>
-      <key>sd_spec6</key>
-      <value></value>
+      <key>width2</key>
+      <value>1</value>
     </param>
     <param>
-      <key>clock_source7</key>
-      <value></value>
+      <key>alpha3</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>time_source7</key>
-      <value></value>
+      <key>color3</key>
+      <value>"red"</value>
     </param>
     <param>
-      <key>sd_spec7</key>
+      <key>label3</key>
       <value></value>
     </param>
     <param>
-      <key>nchan</key>
-      <value>1</value>
+      <key>marker3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>style3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>center_freq0</key>
-      <value>429000000</value>
+      <key>width3</key>
+      <value>1</value>
     </param>
     <param>
-      <key>gain0</key>
-      <value>50</value>
+      <key>alpha4</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>norm_gain0</key>
-      <value>False</value>
+      <key>color4</key>
+      <value>"red"</value>
     </param>
     <param>
-      <key>ant0</key>
+      <key>label4</key>
       <value></value>
     </param>
     <param>
-      <key>bw0</key>
+      <key>marker4</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq1</key>
+      <key>style4</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain1</key>
-      <value>0</value>
+      <key>width4</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain1</key>
-      <value>False</value>
+      <key>alpha5</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant1</key>
+      <key>color5</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label5</key>
       <value></value>
     </param>
     <param>
-      <key>bw1</key>
+      <key>marker5</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq2</key>
+      <key>style5</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain2</key>
-      <value>0</value>
+      <key>width5</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain2</key>
-      <value>False</value>
+      <key>alpha6</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant2</key>
+      <key>color6</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label6</key>
       <value></value>
     </param>
     <param>
-      <key>bw2</key>
+      <key>marker6</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq3</key>
+      <key>style6</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain3</key>
-      <value>0</value>
+      <key>width6</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain3</key>
-      <value>False</value>
+      <key>alpha7</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant3</key>
+      <key>color7</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label7</key>
       <value></value>
     </param>
     <param>
-      <key>bw3</key>
+      <key>marker7</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq4</key>
+      <key>style7</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain4</key>
-      <value>0</value>
+      <key>width7</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain4</key>
-      <value>False</value>
+      <key>alpha8</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant4</key>
+      <key>color8</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label8</key>
       <value></value>
     </param>
     <param>
-      <key>bw4</key>
+      <key>marker8</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq5</key>
+      <key>style8</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain5</key>
-      <value>0</value>
+      <key>width8</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain5</key>
-      <value>False</value>
+      <key>alpha9</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant5</key>
-      <value></value>
+      <key>color9</key>
+      <value>"red"</value>
     </param>
     <param>
-      <key>bw5</key>
-      <value>0</value>
+      <key>label9</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq6</key>
+      <key>marker9</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain6</key>
+      <key>style9</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain6</key>
-      <value>False</value>
+      <key>width9</key>
+      <value>1</value>
     </param>
     <param>
-      <key>ant6</key>
-      <value></value>
+      <key>name</key>
+      <value>""</value>
     </param>
     <param>
-      <key>bw6</key>
-      <value>0</value>
+      <key>nconnections</key>
+      <value>1</value>
     </param>
     <param>
-      <key>center_freq7</key>
-      <value>0</value>
+      <key>size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>gain7</key>
+      <key>tr_chan</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain7</key>
-      <value>False</value>
+      <key>tr_level</key>
+      <value>0.0</value>
     </param>
     <param>
-      <key>ant7</key>
-      <value></value>
+      <key>tr_mode</key>
+      <value>qtgui.TRIG_MODE_FREE</value>
     </param>
     <param>
-      <key>bw7</key>
-      <value>0</value>
+      <key>tr_slope</key>
+      <value>qtgui.TRIG_SLOPE_POS</value>
     </param>
     <param>
-      <key>center_freq8</key>
-      <value>0</value>
+      <key>tr_tag</key>
+      <value>""</value>
     </param>
     <param>
-      <key>gain8</key>
-      <value>0</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>norm_gain8</key>
-      <value>False</value>
+      <key>update_time</key>
+      <value>0.10</value>
     </param>
     <param>
-      <key>ant8</key>
-      <value></value>
+      <key>xmax</key>
+      <value>2</value>
     </param>
     <param>
-      <key>bw8</key>
-      <value>0</value>
+      <key>xmin</key>
+      <value>-2</value>
     </param>
     <param>
-      <key>center_freq9</key>
-      <value>0</value>
+      <key>ymax</key>
+      <value>2</value>
     </param>
     <param>
-      <key>gain9</key>
-      <value>0</value>
+      <key>ymin</key>
+      <value>-2</value>
     </param>
+  </block>
+  <block>
+    <key>uhd_usrp_sink</key>
     <param>
-      <key>norm_gain9</key>
-      <value>False</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>ant9</key>
+      <key>ant0</key>
       <value></value>
     </param>
     <param>
-      <key>bw9</key>
+      <key>bw0</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq10</key>
-      <value>0</value>
+      <key>center_freq0</key>
+      <value>429000000</value>
     </param>
     <param>
-      <key>gain10</key>
-      <value>0</value>
+      <key>norm_gain0</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain10</key>
-      <value>False</value>
+      <key>gain0</key>
+      <value>50</value>
     </param>
     <param>
       <key>ant10</key>
@@ -1293,16 +1217,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq11</key>
+      <key>center_freq10</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain11</key>
-      <value>0</value>
+      <key>norm_gain10</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain11</key>
-      <value>False</value>
+      <key>gain10</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant11</key>
@@ -1313,16 +1237,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq12</key>
+      <key>center_freq11</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain12</key>
-      <value>0</value>
+      <key>norm_gain11</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain12</key>
-      <value>False</value>
+      <key>gain11</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant12</key>
@@ -1333,16 +1257,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq13</key>
+      <key>center_freq12</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain13</key>
-      <value>0</value>
+      <key>norm_gain12</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain13</key>
-      <value>False</value>
+      <key>gain12</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant13</key>
@@ -1353,16 +1277,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq14</key>
+      <key>center_freq13</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain14</key>
-      <value>0</value>
+      <key>norm_gain13</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain14</key>
-      <value>False</value>
+      <key>gain13</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant14</key>
@@ -1373,16 +1297,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq15</key>
+      <key>center_freq14</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain15</key>
-      <value>0</value>
+      <key>norm_gain14</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain15</key>
-      <value>False</value>
+      <key>gain14</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant15</key>
@@ -1393,16 +1317,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq16</key>
+      <key>center_freq15</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain16</key>
-      <value>0</value>
+      <key>norm_gain15</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain16</key>
-      <value>False</value>
+      <key>gain15</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant16</key>
@@ -1413,16 +1337,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq17</key>
+      <key>center_freq16</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain17</key>
-      <value>0</value>
+      <key>norm_gain16</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain17</key>
-      <value>False</value>
+      <key>gain16</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant17</key>
@@ -1433,16 +1357,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq18</key>
+      <key>center_freq17</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain18</key>
-      <value>0</value>
+      <key>norm_gain17</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain18</key>
-      <value>False</value>
+      <key>gain17</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant18</key>
@@ -1453,16 +1377,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq19</key>
+      <key>center_freq18</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain19</key>
-      <value>0</value>
+      <key>norm_gain18</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain19</key>
-      <value>False</value>
+      <key>gain18</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant19</key>
@@ -1473,18 +1397,38 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq20</key>
+      <key>center_freq19</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain20</key>
+      <key>norm_gain19</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>gain19</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain20</key>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>norm_gain1</key>
       <value>False</value>
     </param>
     <param>
+      <key>gain1</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>ant20</key>
       <value></value>
     </param>
@@ -1493,16 +1437,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq21</key>
+      <key>center_freq20</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain21</key>
-      <value>0</value>
+      <key>norm_gain20</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain21</key>
-      <value>False</value>
+      <key>gain20</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant21</key>
@@ -1513,16 +1457,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq22</key>
+      <key>center_freq21</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain22</key>
-      <value>0</value>
+      <key>norm_gain21</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain22</key>
-      <value>False</value>
+      <key>gain21</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant22</key>
@@ -1533,16 +1477,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq23</key>
+      <key>center_freq22</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain23</key>
-      <value>0</value>
+      <key>norm_gain22</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain23</key>
-      <value>False</value>
+      <key>gain22</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant23</key>
@@ -1553,16 +1497,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq24</key>
+      <key>center_freq23</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain24</key>
-      <value>0</value>
+      <key>norm_gain23</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain24</key>
-      <value>False</value>
+      <key>gain23</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant24</key>
@@ -1573,16 +1517,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq25</key>
+      <key>center_freq24</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain25</key>
-      <value>0</value>
+      <key>norm_gain24</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain25</key>
-      <value>False</value>
+      <key>gain24</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant25</key>
@@ -1593,16 +1537,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq26</key>
+      <key>center_freq25</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain26</key>
-      <value>0</value>
+      <key>norm_gain25</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain26</key>
-      <value>False</value>
+      <key>gain25</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant26</key>
@@ -1613,16 +1557,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq27</key>
+      <key>center_freq26</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain27</key>
-      <value>0</value>
+      <key>norm_gain26</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain27</key>
-      <value>False</value>
+      <key>gain26</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant27</key>
@@ -1633,16 +1577,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq28</key>
+      <key>center_freq27</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain28</key>
-      <value>0</value>
+      <key>norm_gain27</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain28</key>
-      <value>False</value>
+      <key>gain27</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant28</key>
@@ -1653,16 +1597,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq29</key>
+      <key>center_freq28</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain29</key>
-      <value>0</value>
+      <key>norm_gain28</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain29</key>
-      <value>False</value>
+      <key>gain28</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant29</key>
@@ -1673,18 +1617,38 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq30</key>
+      <key>center_freq29</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain30</key>
+      <key>norm_gain29</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>gain29</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain30</key>
+      <key>ant2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bw2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq2</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>norm_gain2</key>
       <value>False</value>
     </param>
     <param>
+      <key>gain2</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>ant30</key>
       <value></value>
     </param>
@@ -1693,16 +1657,16 @@
       <value>0</value>
     </param>
     <param>
-      <key>center_freq31</key>
+      <key>center_freq30</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain31</key>
-      <value>0</value>
+      <key>norm_gain30</key>
+      <value>False</value>
     </param>
     <param>
-      <key>norm_gain31</key>
-      <value>False</value>
+      <key>gain30</key>
+      <value>0</value>
     </param>
     <param>
       <key>ant31</key>
@@ -1713,309 +1677,361 @@
       <value>0</value>
     </param>
     <param>
-      <key>len_tag_name</key>
-      <value></value>
+      <key>center_freq31</key>
+      <value>0</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>norm_gain31</key>
+      <value>False</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>gain31</key>
+      <value>0</value>
     </param>
     <param>
-      <key>comment</key>
+      <key>ant3</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(984, 387)</value>
+      <key>bw3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>center_freq3</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
-      <key>id</key>
-      <value>digital_ofdm_cyclic_prefixer_0</value>
+      <key>norm_gain3</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>gain3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>input_size</key>
-      <value>2048</value>
+      <key>ant4</key>
+      <value></value>
     </param>
     <param>
-      <key>cp_len</key>
-      <value>64</value>
+      <key>bw4</key>
+      <value>0</value>
     </param>
     <param>
-      <key>rolloff</key>
+      <key>center_freq4</key>
       <value>0</value>
     </param>
     <param>
-      <key>tagname</key>
-      <value></value>
+      <key>norm_gain4</key>
+      <value>False</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>gain4</key>
+      <value>0</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>ant5</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>bw5</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>center_freq5</key>
       <value>0</value>
     </param>
     <param>
-      <key>comment</key>
+      <key>norm_gain5</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>gain5</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant6</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(392, 419)</value>
+      <key>bw6</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>center_freq6</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_multiply_const_vxx</key>
     <param>
-      <key>id</key>
-      <value>blocks_multiply_const_vxx_0</value>
+      <key>norm_gain6</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>gain6</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>ant7</key>
+      <value></value>
     </param>
     <param>
-      <key>const</key>
-      <value>0.0022097087</value>
+      <key>bw7</key>
+      <value>0</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>center_freq7</key>
+      <value>0</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>norm_gain7</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>gain7</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant8</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>bw8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>center_freq8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>norm_gain8</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>gain8</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ant9</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>bw9</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>center_freq9</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>norm_gain9</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>gain9</key>
       <value>0</value>
     </param>
     <param>
+      <key>clock_rate</key>
+      <value>0.0</value>
+    </param>
+    <param>
       <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>dev_addr</key>
+      <value>"send_frame_size=65536,num_send_frames=128,master_clock_rate=" + str(samp_rate*4)</value>
+    </param>
+    <param>
+      <key>dev_args</key>
+      <value>""</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(664, 435)</value>
+      <value>(984, 344)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>options</key>
     <param>
       <key>id</key>
-      <value>dvbt_tx_demo</value>
+      <value>uhd_usrp_sink_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>type</key>
+      <value>fc32</value>
     </param>
     <param>
-      <key>title</key>
+      <key>clock_source0</key>
       <value></value>
     </param>
     <param>
-      <key>author</key>
+      <key>sd_spec0</key>
       <value></value>
     </param>
     <param>
-      <key>description</key>
+      <key>time_source0</key>
       <value></value>
     </param>
     <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
+      <key>clock_source1</key>
+      <value></value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>qt_gui</value>
+      <key>sd_spec1</key>
+      <value></value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>time_source1</key>
+      <value></value>
     </param>
     <param>
-      <key>run_options</key>
-      <value>prompt</value>
+      <key>clock_source2</key>
+      <value></value>
     </param>
     <param>
-      <key>run</key>
-      <value>True</value>
+      <key>sd_spec2</key>
+      <value></value>
     </param>
     <param>
-      <key>max_nouts</key>
-      <value>0</value>
+      <key>time_source2</key>
+      <value></value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
+      <key>clock_source3</key>
       <value></value>
     </param>
     <param>
-      <key>thread_safe_setters</key>
+      <key>sd_spec3</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>time_source3</key>
       <value></value>
     </param>
     <param>
-      <key>comment</key>
+      <key>clock_source4</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(8, 11)</value>
+      <key>sd_spec4</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>time_source4</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_reference_signals</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_reference_signals_0</value>
+      <key>clock_source5</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>sd_spec5</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>time_source5</key>
+      <value></value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>64qam</value>
+      <key>clock_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>hierarchy</key>
-      <value>nh</value>
+      <key>sd_spec6</key>
+      <value></value>
     </param>
     <param>
-      <key>code_rate_hp</key>
-      <value>C2_3</value>
+      <key>time_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>code_rate_lp</key>
-      <value>C2_3</value>
+      <key>clock_source7</key>
+      <value></value>
     </param>
     <param>
-      <key>guard_interval</key>
-      <value>GI_1_32</value>
+      <key>sd_spec7</key>
+      <value></value>
     </param>
     <param>
-      <key>transmission_mode</key>
-      <value>T2k</value>
+      <key>time_source7</key>
+      <value></value>
     </param>
     <param>
-      <key>include_cell_id</key>
-      <value>cell_ide_no</value>
+      <key>nchan</key>
+      <value>1</value>
     </param>
     <param>
-      <key>cell_id</key>
-      <value>0</value>
+      <key>num_mboards</key>
+      <value>1</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>hide_cmd_port</key>
+      <value>False</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>hide_lo_controls</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>stream_args</key>
+      <value></value>
     </param>
     <param>
-      <key>comment</key>
+      <key>stream_chans</key>
+      <value>[]</value>
+    </param>
+    <param>
+      <key>sync</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(40, 187)</value>
+      <key>len_tag_name</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>180</value>
+      <key>otw</key>
+      <value></value>
     </param>
   </block>
   <connection>
-    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
-    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
+    <source_block_id>blocks_file_source_0</source_block_id>
+    <sink_block_id>dtv_dvbt_energy_dispersal_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>blocks_multiply_const_xx_0</source_block_id>
+    <sink_block_id>uhd_usrp_sink_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_vector_to_stream_0</source_block_id>
+    <sink_block_id>qtgui_const_sink_x_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>dtv_dvbt_energy_dispersal_0</sink_block_id>
+    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
+    <sink_block_id>blocks_multiply_const_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_energy_dispersal_0</source_block_id>
-    <sink_block_id>dtv_dvbt_reed_solomon_enc_0</sink_block_id>
+    <source_block_id>dtv_dvbt_bit_inner_interleaver_0</source_block_id>
+    <sink_block_id>dtv_dvbt_symbol_inner_interleaver_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2026,50 +2042,50 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_inner_coder_0</source_block_id>
-    <sink_block_id>dtv_dvbt_bit_inner_interleaver_0</sink_block_id>
+    <source_block_id>dtv_dvbt_energy_dispersal_0</source_block_id>
+    <sink_block_id>dtv_dvbt_reed_solomon_enc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_bit_inner_interleaver_0</source_block_id>
-    <sink_block_id>dtv_dvbt_symbol_inner_interleaver_0</sink_block_id>
+    <source_block_id>dtv_dvbt_inner_coder_0</source_block_id>
+    <sink_block_id>dtv_dvbt_bit_inner_interleaver_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_symbol_inner_interleaver_0</source_block_id>
-    <sink_block_id>dtv_dvbt_map_0</sink_block_id>
+    <source_block_id>dtv_dvbt_map_0</source_block_id>
+    <sink_block_id>dtv_dvbt_reference_signals_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_map_0</source_block_id>
-    <sink_block_id>dtv_dvbt_reference_signals_0</sink_block_id>
+    <source_block_id>dtv_dvbt_reed_solomon_enc_0</source_block_id>
+    <sink_block_id>dtv_dvbt_convolutional_interleaver_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>dtv_dvbt_reference_signals_0</source_block_id>
-    <sink_block_id>fft_vxx_0</sink_block_id>
+    <sink_block_id>blocks_vector_to_stream_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>dtv_dvbt_reference_signals_0</source_block_id>
-    <sink_block_id>blocks_vector_to_stream_0</sink_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_vector_to_stream_0</source_block_id>
-    <sink_block_id>qtgui_const_sink_x_0</sink_block_id>
+    <source_block_id>dtv_dvbt_symbol_inner_interleaver_0</source_block_id>
+    <sink_block_id>dtv_dvbt_map_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_reed_solomon_enc_0</source_block_id>
-    <sink_block_id>dtv_dvbt_convolutional_interleaver_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>
diff --git a/gr-dtv/examples/dvbt_tx_8k.grc b/gr-dtv/examples/dvbt_tx_8k.grc
index 4cad688e29..9c5cc325e9 100644
--- a/gr-dtv/examples/dvbt_tx_8k.grc
+++ b/gr-dtv/examples/dvbt_tx_8k.grc
@@ -1,397 +1,439 @@
-<?xml version='1.0' encoding='ASCII'?>
-<?grc format='1' created='3.7.8'?>
+<?xml version='1.0' encoding='utf-8'?>
+<?grc format='1' created='3.7.11'?>
 <flow_graph>
   <timestamp>Thu Jan 16 23:00:58 2014</timestamp>
   <block>
-    <key>qtgui_const_sink_x</key>
+    <key>options</key>
     <param>
-      <key>id</key>
-      <value>qtgui_const_sink_x_0</value>
+      <key>author</key>
+      <value></value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>description</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>_coordinate</key>
+      <value>(8, 12)</value>
     </param>
     <param>
-      <key>name</key>
-      <value>""</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>size</key>
-      <value>1024</value>
+      <key>generate_options</key>
+      <value>qt_gui</value>
     </param>
     <param>
-      <key>grid</key>
-      <value>False</value>
+      <key>hier_block_src_path</key>
+      <value>.:</value>
     </param>
     <param>
-      <key>autoscale</key>
-      <value>False</value>
+      <key>id</key>
+      <value>dvbt_tx_demo</value>
     </param>
     <param>
-      <key>ymin</key>
-      <value>-2</value>
+      <key>max_nouts</key>
+      <value>0</value>
     </param>
     <param>
-      <key>ymax</key>
-      <value>2</value>
+      <key>qt_qss_theme</key>
+      <value></value>
     </param>
     <param>
-      <key>xmin</key>
-      <value>-2</value>
+      <key>realtime_scheduling</key>
+      <value></value>
     </param>
     <param>
-      <key>xmax</key>
-      <value>2</value>
+      <key>run_command</key>
+      <value>{python} -u {filename}</value>
     </param>
     <param>
-      <key>nconnections</key>
-      <value>1</value>
+      <key>run_options</key>
+      <value>prompt</value>
     </param>
     <param>
-      <key>update_time</key>
-      <value>0.10</value>
+      <key>run</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gui_hint</key>
+      <key>thread_safe_setters</key>
       <value></value>
     </param>
     <param>
-      <key>tr_mode</key>
-      <value>qtgui.TRIG_MODE_FREE</value>
+      <key>title</key>
+      <value></value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>tr_slope</key>
-      <value>qtgui.TRIG_SLOPE_POS</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>tr_level</key>
-      <value>0.0</value>
+      <key>_coordinate</key>
+      <value>(8, 76)</value>
     </param>
     <param>
-      <key>tr_chan</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>tr_tag</key>
-      <value>""</value>
+      <key>id</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>legend</key>
-      <value>True</value>
+      <key>value</key>
+      <value>(8000000.0 * 8) / 7</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_file_source</key>
     <param>
-      <key>label1</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>width1</key>
-      <value>1</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>color1</key>
-      <value>"blue"</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>style1</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>marker1</key>
-      <value>0</value>
+      <key>file</key>
+      <value>/run/shm/advtest.ts</value>
     </param>
     <param>
-      <key>alpha1</key>
-      <value>1.0</value>
+      <key>_coordinate</key>
+      <value>(120, 76)</value>
     </param>
     <param>
-      <key>label2</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>width2</key>
-      <value>1</value>
+      <key>id</key>
+      <value>blocks_file_source_0</value>
     </param>
     <param>
-      <key>color2</key>
-      <value>"red"</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>style2</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>marker2</key>
-      <value>0</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>alpha2</key>
-      <value>1.0</value>
+      <key>repeat</key>
+      <value>True</value>
     </param>
     <param>
-      <key>label3</key>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+  </block>
+  <block>
+    <key>blocks_multiply_const_xx</key>
+    <param>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>width3</key>
-      <value>1</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>color3</key>
-      <value>"red"</value>
+      <key>const</key>
+      <value>0.0022097087</value>
     </param>
     <param>
-      <key>style3</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>marker3</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>alpha3</key>
-      <value>1.0</value>
+      <key>_coordinate</key>
+      <value>(696, 388)</value>
     </param>
     <param>
-      <key>label4</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>width4</key>
-      <value>1</value>
+      <key>id</key>
+      <value>blocks_multiply_const_xx_0</value>
     </param>
     <param>
-      <key>color4</key>
-      <value>"red"</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>style4</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>marker4</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>alpha4</key>
-      <value>1.0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_vector_to_stream</key>
     <param>
-      <key>label5</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>width5</key>
-      <value>1</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>color5</key>
-      <value>"red"</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>style5</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>marker5</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(120, 500)</value>
     </param>
     <param>
-      <key>alpha5</key>
-      <value>1.0</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>label6</key>
-      <value></value>
+      <key>id</key>
+      <value>blocks_vector_to_stream_0</value>
     </param>
     <param>
-      <key>width6</key>
-      <value>1</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>color6</key>
-      <value>"red"</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>style6</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>marker6</key>
-      <value>0</value>
+      <key>num_items</key>
+      <value>8192</value>
     </param>
     <param>
-      <key>alpha6</key>
-      <value>1.0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
-      <key>label7</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>width7</key>
-      <value>1</value>
+      <key>cp_len</key>
+      <value>256</value>
     </param>
     <param>
-      <key>color7</key>
-      <value>"red"</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>style7</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>marker7</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>alpha7</key>
-      <value>1.0</value>
+      <key>input_size</key>
+      <value>8192</value>
     </param>
     <param>
-      <key>label8</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(392, 368)</value>
     </param>
     <param>
-      <key>width8</key>
-      <value>1</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>color8</key>
-      <value>"red"</value>
+      <key>id</key>
+      <value>digital_ofdm_cyclic_prefixer_0</value>
     </param>
     <param>
-      <key>style8</key>
+      <key>tagname</key>
+      <value></value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>marker8</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>alpha8</key>
-      <value>1.0</value>
+      <key>rolloff</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_bit_inner_interleaver</key>
     <param>
-      <key>label9</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>width9</key>
-      <value>1</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>color9</key>
-      <value>"red"</value>
+      <key>constellation</key>
+      <value>64qam</value>
     </param>
     <param>
-      <key>style9</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>marker9</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>alpha9</key>
-      <value>1.0</value>
+      <key>_coordinate</key>
+      <value>(984, 204)</value>
     </param>
     <param>
-      <key>label10</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>180</value>
     </param>
     <param>
-      <key>width10</key>
-      <value>1</value>
+      <key>hierarchy</key>
+      <value>nh</value>
     </param>
     <param>
-      <key>color10</key>
-      <value>"red"</value>
+      <key>id</key>
+      <value>dtv_dvbt_bit_inner_interleaver_0</value>
     </param>
     <param>
-      <key>style10</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>marker10</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>alpha10</key>
-      <value>1.0</value>
+      <key>transmission_mode</key>
+      <value>T8k</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_convolutional_interleaver</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>blocks</key>
+      <value>136</value>
     </param>
     <param>
       <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(360, 555)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>samp_rate</value>
+      <key>M</key>
+      <value>17</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>(8000000.0 * 8) / 7</value>
+      <key>_coordinate</key>
+      <value>(776, 52)</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>id</key>
+      <value>dtv_dvbt_convolutional_interleaver_0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(8, 83)</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
+    <param>
+      <key>I</key>
+      <value>12</value>
+    </param>
   </block>
   <block>
     <key>dtv_dvbt_energy_dispersal</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_energy_dispersal_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>nsize</key>
       <value>1</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -399,1404 +441,1399 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>_coordinate</key>
+      <value>(336, 72)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>id</key>
+      <value>dtv_dvbt_energy_dispersal_0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(328, 96)</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
   </block>
   <block>
-    <key>dtv_dvbt_reed_solomon_enc</key>
+    <key>dtv_dvbt_inner_coder</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_reed_solomon_enc_0</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>code_rate</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>p</key>
-      <value>2</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>m</key>
-      <value>8</value>
+      <key>constellation</key>
+      <value>64qam</value>
     </param>
     <param>
-      <key>gfpoly</key>
-      <value>0x11d</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>n</key>
-      <value>255</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>k</key>
-      <value>239</value>
+      <key>_coordinate</key>
+      <value>(1032, 48)</value>
     </param>
     <param>
-      <key>t</key>
-      <value>8</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>s</key>
-      <value>51</value>
+      <key>hierarchy</key>
+      <value>nh</value>
     </param>
     <param>
-      <key>blocks</key>
-      <value>8</value>
+      <key>id</key>
+      <value>dtv_dvbt_inner_coder_0</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>ninput</key>
+      <value>1</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>noutput</key>
+      <value>6048</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_map</key>
     <param>
-      <key>comment</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(512, 43)</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>constellation</key>
+      <value>64qam</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_convolutional_interleaver</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_convolutional_interleaver_0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>blocks</key>
-      <value>136</value>
+      <key>_coordinate</key>
+      <value>(368, 192)</value>
     </param>
     <param>
-      <key>I</key>
-      <value>12</value>
+      <key>_rotation</key>
+      <value>180</value>
     </param>
     <param>
-      <key>M</key>
-      <value>17</value>
+      <key>gain</key>
+      <value>1</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>hierarchy</key>
+      <value>nh</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>id</key>
+      <value>dtv_dvbt_map_0</value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>comment</key>
+      <key>transmission_mode</key>
+      <value>T8k</value>
+    </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_reed_solomon_enc</key>
+    <param>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(736, 75)</value>
+      <key>blocks</key>
+      <value>8</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>comment</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>blocks_file_source</key>
     <param>
-      <key>id</key>
-      <value>blocks_file_source_0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>file</key>
-      <value>/run/shm/advtest.ts</value>
+      <key>gfpoly</key>
+      <value>0x11d</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
+      <key>_coordinate</key>
+      <value>(536, 24)</value>
     </param>
     <param>
-      <key>repeat</key>
-      <value>True</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>id</key>
+      <value>dtv_dvbt_reed_solomon_enc_0</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>k</key>
+      <value>239</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>n</key>
+      <value>255</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>s</key>
+      <value>51</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(112, 83)</value>
+      <key>m</key>
+      <value>8</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>p</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>t</key>
+      <value>8</value>
     </param>
   </block>
   <block>
-    <key>uhd_usrp_sink</key>
+    <key>dtv_dvbt_reference_signals</key>
     <param>
-      <key>id</key>
-      <value>uhd_usrp_sink_0</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>cell_id</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>fc32</value>
+      <key>code_rate_hp</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>otw</key>
-      <value></value>
+      <key>code_rate_lp</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>stream_args</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>stream_chans</key>
-      <value>[]</value>
-    </param>
-    <param>
-      <key>dev_addr</key>
-      <value>"send_frame_size=65536,num_send_frames=128,master_clock_rate=" + str(samp_rate*4)</value>
-    </param>
-    <param>
-      <key>dev_args</key>
-      <value>""</value>
+      <key>constellation</key>
+      <value>64qam</value>
     </param>
     <param>
-      <key>sync</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>clock_rate</key>
-      <value>0.0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>num_mboards</key>
-      <value>1</value>
+      <key>_coordinate</key>
+      <value>(48, 156)</value>
     </param>
     <param>
-      <key>clock_source0</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>180</value>
     </param>
     <param>
-      <key>time_source0</key>
-      <value></value>
+      <key>guard_interval</key>
+      <value>GI_1_32</value>
     </param>
     <param>
-      <key>sd_spec0</key>
-      <value></value>
+      <key>hierarchy</key>
+      <value>nh</value>
     </param>
     <param>
-      <key>clock_source1</key>
-      <value></value>
+      <key>id</key>
+      <value>dtv_dvbt_reference_signals_0</value>
     </param>
     <param>
-      <key>time_source1</key>
-      <value></value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>sd_spec1</key>
-      <value></value>
+      <key>include_cell_id</key>
+      <value>call_id_yes</value>
     </param>
     <param>
-      <key>clock_source2</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>time_source2</key>
-      <value></value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>sd_spec2</key>
-      <value></value>
+      <key>transmission_mode</key>
+      <value>T8k</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt_symbol_inner_interleaver</key>
     <param>
-      <key>clock_source3</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>time_source3</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>sd_spec3</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>clock_source4</key>
-      <value></value>
+      <key>direction</key>
+      <value>Interleave</value>
     </param>
     <param>
-      <key>time_source4</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>sd_spec4</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(672, 204)</value>
     </param>
     <param>
-      <key>clock_source5</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>180</value>
     </param>
     <param>
-      <key>time_source5</key>
-      <value></value>
+      <key>id</key>
+      <value>dtv_dvbt_symbol_inner_interleaver_0</value>
     </param>
     <param>
-      <key>sd_spec5</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>clock_source6</key>
-      <value></value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>time_source6</key>
-      <value></value>
+      <key>transmission_mode</key>
+      <value>T8k</value>
     </param>
+  </block>
+  <block>
+    <key>fft_vxx</key>
     <param>
-      <key>sd_spec6</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>clock_source7</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>time_source7</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>sd_spec7</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>nchan</key>
-      <value>1</value>
+      <key>fft_size</key>
+      <value>8192</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>forward</key>
+      <value>False</value>
     </param>
     <param>
-      <key>center_freq0</key>
-      <value>429000000</value>
+      <key>_coordinate</key>
+      <value>(88, 360)</value>
     </param>
     <param>
-      <key>gain0</key>
-      <value>50</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>norm_gain0</key>
-      <value>False</value>
+      <key>id</key>
+      <value>fft_vxx_0</value>
     </param>
     <param>
-      <key>ant0</key>
-      <value></value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>bw0</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq1</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain1</key>
-      <value>0</value>
+      <key>nthreads</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain1</key>
-      <value>False</value>
+      <key>shift</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ant1</key>
-      <value></value>
+      <key>window</key>
+      <value>window.rectangular(8192)</value>
     </param>
+  </block>
+  <block>
+    <key>qtgui_const_sink_x</key>
     <param>
-      <key>bw1</key>
-      <value>0</value>
+      <key>autoscale</key>
+      <value>False</value>
     </param>
     <param>
-      <key>center_freq2</key>
-      <value>0</value>
+      <key>axislabels</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain2</key>
-      <value>0</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>norm_gain2</key>
-      <value>False</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>ant2</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw2</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>center_freq3</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(360, 492)</value>
     </param>
     <param>
-      <key>gain3</key>
-      <value>0</value>
+      <key>gui_hint</key>
+      <value></value>
     </param>
     <param>
-      <key>norm_gain3</key>
-      <value>False</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>ant3</key>
-      <value></value>
+      <key>grid</key>
+      <value>False</value>
     </param>
     <param>
-      <key>bw3</key>
-      <value>0</value>
+      <key>id</key>
+      <value>qtgui_const_sink_x_0</value>
     </param>
     <param>
-      <key>center_freq4</key>
-      <value>0</value>
+      <key>legend</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain4</key>
-      <value>0</value>
+      <key>alpha1</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>norm_gain4</key>
-      <value>False</value>
+      <key>color1</key>
+      <value>"blue"</value>
     </param>
     <param>
-      <key>ant4</key>
+      <key>label1</key>
       <value></value>
     </param>
     <param>
-      <key>bw4</key>
+      <key>marker1</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq5</key>
+      <key>style1</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain5</key>
-      <value>0</value>
+      <key>width1</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain5</key>
-      <value>False</value>
+      <key>alpha10</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant5</key>
+      <key>color10</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label10</key>
       <value></value>
     </param>
     <param>
-      <key>bw5</key>
+      <key>marker10</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq6</key>
+      <key>style10</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain6</key>
-      <value>0</value>
+      <key>width10</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain6</key>
-      <value>False</value>
+      <key>alpha2</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant6</key>
+      <key>color2</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label2</key>
       <value></value>
     </param>
     <param>
-      <key>bw6</key>
+      <key>marker2</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq7</key>
+      <key>style2</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain7</key>
-      <value>0</value>
+      <key>width2</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain7</key>
-      <value>False</value>
+      <key>alpha3</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant7</key>
+      <key>color3</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label3</key>
       <value></value>
     </param>
     <param>
-      <key>bw7</key>
+      <key>marker3</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq8</key>
+      <key>style3</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain8</key>
-      <value>0</value>
+      <key>width3</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain8</key>
-      <value>False</value>
+      <key>alpha4</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant8</key>
+      <key>color4</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label4</key>
       <value></value>
     </param>
     <param>
-      <key>bw8</key>
+      <key>marker4</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq9</key>
+      <key>style4</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain9</key>
-      <value>0</value>
+      <key>width4</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain9</key>
-      <value>False</value>
+      <key>alpha5</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant9</key>
+      <key>color5</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label5</key>
       <value></value>
     </param>
     <param>
-      <key>bw9</key>
+      <key>marker5</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq10</key>
+      <key>style5</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain10</key>
-      <value>0</value>
+      <key>width5</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain10</key>
-      <value>False</value>
+      <key>alpha6</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant10</key>
+      <key>color6</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label6</key>
       <value></value>
     </param>
     <param>
-      <key>bw10</key>
+      <key>marker6</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq11</key>
+      <key>style6</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain11</key>
-      <value>0</value>
+      <key>width6</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain11</key>
-      <value>False</value>
+      <key>alpha7</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant11</key>
+      <key>color7</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label7</key>
       <value></value>
     </param>
     <param>
-      <key>bw11</key>
+      <key>marker7</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq12</key>
+      <key>style7</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain12</key>
-      <value>0</value>
+      <key>width7</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain12</key>
-      <value>False</value>
+      <key>alpha8</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant12</key>
+      <key>color8</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label8</key>
       <value></value>
     </param>
     <param>
-      <key>bw12</key>
+      <key>marker8</key>
       <value>0</value>
     </param>
     <param>
-      <key>center_freq13</key>
+      <key>style8</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain13</key>
-      <value>0</value>
+      <key>width8</key>
+      <value>1</value>
     </param>
     <param>
-      <key>norm_gain13</key>
-      <value>False</value>
+      <key>alpha9</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>ant13</key>
-      <value></value>
+      <key>color9</key>
+      <value>"red"</value>
     </param>
     <param>
-      <key>bw13</key>
-      <value>0</value>
+      <key>label9</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq14</key>
+      <key>marker9</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain14</key>
+      <key>style9</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain14</key>
-      <value>False</value>
+      <key>width9</key>
+      <value>1</value>
     </param>
     <param>
-      <key>ant14</key>
-      <value></value>
+      <key>name</key>
+      <value>""</value>
     </param>
     <param>
-      <key>bw14</key>
-      <value>0</value>
+      <key>nconnections</key>
+      <value>1</value>
     </param>
     <param>
-      <key>center_freq15</key>
-      <value>0</value>
+      <key>size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>gain15</key>
+      <key>tr_chan</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain15</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>ant15</key>
-      <value></value>
+      <key>tr_level</key>
+      <value>0.0</value>
     </param>
     <param>
-      <key>bw15</key>
-      <value>0</value>
+      <key>tr_mode</key>
+      <value>qtgui.TRIG_MODE_FREE</value>
     </param>
     <param>
-      <key>center_freq16</key>
-      <value>0</value>
+      <key>tr_slope</key>
+      <value>qtgui.TRIG_SLOPE_POS</value>
     </param>
     <param>
-      <key>gain16</key>
-      <value>0</value>
+      <key>tr_tag</key>
+      <value>""</value>
     </param>
     <param>
-      <key>norm_gain16</key>
-      <value>False</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>ant16</key>
-      <value></value>
+      <key>update_time</key>
+      <value>0.10</value>
     </param>
     <param>
-      <key>bw16</key>
-      <value>0</value>
+      <key>xmax</key>
+      <value>2</value>
     </param>
     <param>
-      <key>center_freq17</key>
-      <value>0</value>
+      <key>xmin</key>
+      <value>-2</value>
     </param>
     <param>
-      <key>gain17</key>
-      <value>0</value>
+      <key>ymax</key>
+      <value>2</value>
     </param>
     <param>
-      <key>norm_gain17</key>
-      <value>False</value>
+      <key>ymin</key>
+      <value>-2</value>
     </param>
+  </block>
+  <block>
+    <key>uhd_usrp_sink</key>
     <param>
-      <key>ant17</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>bw17</key>
-      <value>0</value>
+      <key>ant0</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq18</key>
+      <key>bw0</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain18</key>
-      <value>0</value>
+      <key>center_freq0</key>
+      <value>429000000</value>
     </param>
     <param>
-      <key>norm_gain18</key>
+      <key>norm_gain0</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant18</key>
-      <value></value>
+      <key>gain0</key>
+      <value>50</value>
     </param>
     <param>
-      <key>bw18</key>
-      <value>0</value>
+      <key>ant10</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq19</key>
+      <key>bw10</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain19</key>
+      <key>center_freq10</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain19</key>
+      <key>norm_gain10</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant19</key>
-      <value></value>
+      <key>gain10</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw19</key>
-      <value>0</value>
+      <key>ant11</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq20</key>
+      <key>bw11</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain20</key>
+      <key>center_freq11</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain20</key>
+      <key>norm_gain11</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant20</key>
-      <value></value>
+      <key>gain11</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw20</key>
-      <value>0</value>
+      <key>ant12</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq21</key>
+      <key>bw12</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain21</key>
+      <key>center_freq12</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain21</key>
+      <key>norm_gain12</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant21</key>
-      <value></value>
+      <key>gain12</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw21</key>
-      <value>0</value>
+      <key>ant13</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq22</key>
+      <key>bw13</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain22</key>
+      <key>center_freq13</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain22</key>
+      <key>norm_gain13</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant22</key>
-      <value></value>
+      <key>gain13</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw22</key>
-      <value>0</value>
+      <key>ant14</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq23</key>
+      <key>bw14</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain23</key>
+      <key>center_freq14</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain23</key>
+      <key>norm_gain14</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant23</key>
-      <value></value>
+      <key>gain14</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw23</key>
-      <value>0</value>
+      <key>ant15</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq24</key>
+      <key>bw15</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain24</key>
+      <key>center_freq15</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain24</key>
+      <key>norm_gain15</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant24</key>
-      <value></value>
+      <key>gain15</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw24</key>
-      <value>0</value>
+      <key>ant16</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq25</key>
+      <key>bw16</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain25</key>
+      <key>center_freq16</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain25</key>
+      <key>norm_gain16</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant25</key>
-      <value></value>
+      <key>gain16</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw25</key>
-      <value>0</value>
+      <key>ant17</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq26</key>
+      <key>bw17</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain26</key>
+      <key>center_freq17</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain26</key>
+      <key>norm_gain17</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant26</key>
-      <value></value>
+      <key>gain17</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw26</key>
-      <value>0</value>
+      <key>ant18</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq27</key>
+      <key>bw18</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain27</key>
+      <key>center_freq18</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain27</key>
+      <key>norm_gain18</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant27</key>
-      <value></value>
+      <key>gain18</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw27</key>
-      <value>0</value>
+      <key>ant19</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq28</key>
+      <key>bw19</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain28</key>
+      <key>center_freq19</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain28</key>
+      <key>norm_gain19</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant28</key>
-      <value></value>
+      <key>gain19</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw28</key>
-      <value>0</value>
+      <key>ant1</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq29</key>
+      <key>bw1</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain29</key>
+      <key>center_freq1</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain29</key>
+      <key>norm_gain1</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant29</key>
-      <value></value>
+      <key>gain1</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw29</key>
-      <value>0</value>
+      <key>ant20</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq30</key>
+      <key>bw20</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain30</key>
+      <key>center_freq20</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain30</key>
+      <key>norm_gain20</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant30</key>
-      <value></value>
+      <key>gain20</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw30</key>
-      <value>0</value>
+      <key>ant21</key>
+      <value></value>
     </param>
     <param>
-      <key>center_freq31</key>
+      <key>bw21</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain31</key>
+      <key>center_freq21</key>
       <value>0</value>
     </param>
     <param>
-      <key>norm_gain31</key>
+      <key>norm_gain21</key>
       <value>False</value>
     </param>
     <param>
-      <key>ant31</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw31</key>
+      <key>gain21</key>
       <value>0</value>
     </param>
     <param>
-      <key>len_tag_name</key>
-      <value></value>
-    </param>
-    <param>
-      <key>alias</key>
+      <key>ant22</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>bw22</key>
+      <value>0</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>center_freq22</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(984, 387)</value>
+      <key>norm_gain22</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>gain22</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_multiply_const_vxx</key>
     <param>
-      <key>id</key>
-      <value>blocks_multiply_const_vxx_0</value>
+      <key>ant23</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>bw23</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>center_freq23</key>
+      <value>0</value>
     </param>
     <param>
-      <key>const</key>
-      <value>0.0022097087</value>
+      <key>norm_gain23</key>
+      <value>False</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>gain23</key>
+      <value>0</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>ant24</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>bw24</key>
+      <value>0</value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>center_freq24</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>norm_gain24</key>
+      <value>False</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>gain24</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(664, 435)</value>
+      <key>ant25</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>bw25</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>options</key>
     <param>
-      <key>id</key>
-      <value>dvbt_tx_demo</value>
+      <key>center_freq25</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>norm_gain25</key>
+      <value>False</value>
     </param>
     <param>
-      <key>title</key>
-      <value></value>
+      <key>gain25</key>
+      <value>0</value>
     </param>
     <param>
-      <key>author</key>
+      <key>ant26</key>
       <value></value>
     </param>
     <param>
-      <key>description</key>
-      <value></value>
+      <key>bw26</key>
+      <value>0</value>
     </param>
     <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
+      <key>center_freq26</key>
+      <value>0</value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>qt_gui</value>
+      <key>norm_gain26</key>
+      <value>False</value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>gain26</key>
+      <value>0</value>
     </param>
     <param>
-      <key>run_options</key>
-      <value>prompt</value>
+      <key>ant27</key>
+      <value></value>
     </param>
     <param>
-      <key>run</key>
-      <value>True</value>
+      <key>bw27</key>
+      <value>0</value>
     </param>
     <param>
-      <key>max_nouts</key>
+      <key>center_freq27</key>
       <value>0</value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
-      <value></value>
+      <key>norm_gain27</key>
+      <value>False</value>
     </param>
     <param>
-      <key>thread_safe_setters</key>
-      <value></value>
+      <key>gain27</key>
+      <value>0</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>ant28</key>
       <value></value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>bw28</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(8, 11)</value>
+      <key>center_freq28</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>norm_gain28</key>
+      <value>False</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_bit_inner_interleaver</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_bit_inner_interleaver_0</value>
+      <key>gain28</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>ant29</key>
+      <value></value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>64qam</value>
+      <key>bw29</key>
+      <value>0</value>
     </param>
     <param>
-      <key>hierarchy</key>
-      <value>nh</value>
+      <key>center_freq29</key>
+      <value>0</value>
     </param>
     <param>
-      <key>transmission_mode</key>
-      <value>T8k</value>
+      <key>norm_gain29</key>
+      <value>False</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>gain29</key>
+      <value>0</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>ant2</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>bw2</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>center_freq2</key>
       <value>0</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>norm_gain2</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(984, 243)</value>
+      <key>gain2</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>180</value>
+      <key>ant30</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_symbol_inner_interleaver</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_symbol_inner_interleaver_0</value>
+      <key>bw30</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>center_freq30</key>
+      <value>0</value>
     </param>
     <param>
-      <key>transmission_mode</key>
-      <value>T8k</value>
+      <key>norm_gain30</key>
+      <value>False</value>
     </param>
     <param>
-      <key>direction</key>
-      <value>Interleave</value>
+      <key>gain30</key>
+      <value>0</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>ant31</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>bw31</key>
+      <value>0</value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>center_freq31</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>norm_gain31</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>gain31</key>
       <value>0</value>
     </param>
     <param>
-      <key>comment</key>
+      <key>ant3</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(664, 243)</value>
+      <key>bw3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>180</value>
+      <key>center_freq3</key>
+      <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_map</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_map_0</value>
+      <key>norm_gain3</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>gain3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>64qam</value>
+      <key>ant4</key>
+      <value></value>
     </param>
     <param>
-      <key>hierarchy</key>
-      <value>nh</value>
+      <key>bw4</key>
+      <value>0</value>
     </param>
     <param>
-      <key>transmission_mode</key>
-      <value>T8k</value>
+      <key>center_freq4</key>
+      <value>0</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>1</value>
+      <key>norm_gain4</key>
+      <value>False</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>gain4</key>
+      <value>0</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>ant5</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>bw5</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>center_freq5</key>
       <value>0</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(344, 227)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
+      <key>norm_gain5</key>
+      <value>False</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_reference_signals</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_reference_signals_0</value>
+      <key>gain5</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>ant6</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>bw6</key>
+      <value>0</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>64qam</value>
+      <key>center_freq6</key>
+      <value>0</value>
     </param>
     <param>
-      <key>hierarchy</key>
-      <value>nh</value>
+      <key>norm_gain6</key>
+      <value>False</value>
     </param>
     <param>
-      <key>code_rate_hp</key>
-      <value>C2_3</value>
+      <key>gain6</key>
+      <value>0</value>
     </param>
     <param>
-      <key>code_rate_lp</key>
-      <value>C2_3</value>
+      <key>ant7</key>
+      <value></value>
     </param>
     <param>
-      <key>guard_interval</key>
-      <value>GI_1_32</value>
+      <key>bw7</key>
+      <value>0</value>
     </param>
     <param>
-      <key>transmission_mode</key>
-      <value>T8k</value>
+      <key>center_freq7</key>
+      <value>0</value>
     </param>
     <param>
-      <key>include_cell_id</key>
-      <value>cell_ide_no</value>
+      <key>norm_gain7</key>
+      <value>False</value>
     </param>
     <param>
-      <key>cell_id</key>
+      <key>gain7</key>
       <value>0</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
+      <key>ant8</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>bw8</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>center_freq8</key>
       <value>0</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(40, 187)</value>
+      <key>norm_gain8</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-  </block>
-  <block>
-    <key>fft_vxx</key>
-    <param>
-      <key>id</key>
-      <value>fft_vxx_0</value>
+      <key>gain8</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>ant9</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>bw9</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>8192</value>
+      <key>center_freq9</key>
+      <value>0</value>
     </param>
     <param>
-      <key>forward</key>
+      <key>norm_gain9</key>
       <value>False</value>
     </param>
     <param>
-      <key>window</key>
-      <value>window.rectangular(8192)</value>
-    </param>
-    <param>
-      <key>shift</key>
-      <value>True</value>
+      <key>gain9</key>
+      <value>0</value>
     </param>
     <param>
-      <key>nthreads</key>
-      <value>1</value>
+      <key>clock_rate</key>
+      <value>0.0</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -1804,218 +1841,197 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>dev_addr</key>
+      <value>"send_frame_size=65536,num_send_frames=128,master_clock_rate=" + str(samp_rate*4)</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>dev_args</key>
+      <value>""</value>
     </param>
     <param>
-      <key>comment</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(64, 403)</value>
+      <value>(984, 344)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_vector_to_stream</key>
     <param>
       <key>id</key>
-      <value>blocks_vector_to_stream_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <value>uhd_usrp_sink_0</value>
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>fc32</value>
     </param>
     <param>
-      <key>num_items</key>
-      <value>8192</value>
+      <key>clock_source0</key>
+      <value></value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>sd_spec0</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>time_source0</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>clock_source1</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>sd_spec1</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>time_source1</key>
+      <value></value>
     </param>
     <param>
-      <key>comment</key>
+      <key>clock_source2</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(120, 563)</value>
+      <key>sd_spec2</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>time_source2</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
-      <key>id</key>
-      <value>digital_ofdm_cyclic_prefixer_0</value>
+      <key>clock_source3</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>sd_spec3</key>
+      <value></value>
     </param>
     <param>
-      <key>input_size</key>
-      <value>8192</value>
+      <key>time_source3</key>
+      <value></value>
     </param>
     <param>
-      <key>cp_len</key>
-      <value>256</value>
+      <key>clock_source4</key>
+      <value></value>
     </param>
     <param>
-      <key>rolloff</key>
-      <value>0</value>
+      <key>sd_spec4</key>
+      <value></value>
     </param>
     <param>
-      <key>tagname</key>
+      <key>time_source4</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>clock_source5</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>sd_spec5</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>time_source5</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>clock_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>comment</key>
+      <key>sd_spec6</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(392, 419)</value>
+      <key>time_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>clock_source7</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt_inner_coder</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt_inner_coder_0</value>
+      <key>sd_spec7</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>time_source7</key>
+      <value></value>
     </param>
     <param>
-      <key>ninput</key>
+      <key>nchan</key>
       <value>1</value>
     </param>
     <param>
-      <key>noutput</key>
-      <value>6048</value>
-    </param>
-    <param>
-      <key>constellation</key>
-      <value>64qam</value>
+      <key>num_mboards</key>
+      <value>1</value>
     </param>
     <param>
-      <key>hierarchy</key>
-      <value>nh</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>code_rate</key>
-      <value>C2_3</value>
+      <key>hide_cmd_port</key>
+      <value>False</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>hide_lo_controls</key>
+      <value>True</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>stream_args</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>stream_chans</key>
+      <value>[]</value>
     </param>
     <param>
-      <key>comment</key>
+      <key>sync</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(1000, 67)</value>
+      <key>len_tag_name</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>otw</key>
+      <value></value>
     </param>
   </block>
   <connection>
-    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
-    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
+    <source_block_id>blocks_file_source_0</source_block_id>
+    <sink_block_id>dtv_dvbt_energy_dispersal_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>blocks_multiply_const_xx_0</source_block_id>
+    <sink_block_id>uhd_usrp_sink_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_vector_to_stream_0</source_block_id>
+    <sink_block_id>qtgui_const_sink_x_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>dtv_dvbt_energy_dispersal_0</sink_block_id>
+    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
+    <sink_block_id>blocks_multiply_const_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_energy_dispersal_0</source_block_id>
-    <sink_block_id>dtv_dvbt_reed_solomon_enc_0</sink_block_id>
+    <source_block_id>dtv_dvbt_bit_inner_interleaver_0</source_block_id>
+    <sink_block_id>dtv_dvbt_symbol_inner_interleaver_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2026,50 +2042,50 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_inner_coder_0</source_block_id>
-    <sink_block_id>dtv_dvbt_bit_inner_interleaver_0</sink_block_id>
+    <source_block_id>dtv_dvbt_energy_dispersal_0</source_block_id>
+    <sink_block_id>dtv_dvbt_reed_solomon_enc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_bit_inner_interleaver_0</source_block_id>
-    <sink_block_id>dtv_dvbt_symbol_inner_interleaver_0</sink_block_id>
+    <source_block_id>dtv_dvbt_inner_coder_0</source_block_id>
+    <sink_block_id>dtv_dvbt_bit_inner_interleaver_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_symbol_inner_interleaver_0</source_block_id>
-    <sink_block_id>dtv_dvbt_map_0</sink_block_id>
+    <source_block_id>dtv_dvbt_map_0</source_block_id>
+    <sink_block_id>dtv_dvbt_reference_signals_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_map_0</source_block_id>
-    <sink_block_id>dtv_dvbt_reference_signals_0</sink_block_id>
+    <source_block_id>dtv_dvbt_reed_solomon_enc_0</source_block_id>
+    <sink_block_id>dtv_dvbt_convolutional_interleaver_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>dtv_dvbt_reference_signals_0</source_block_id>
-    <sink_block_id>fft_vxx_0</sink_block_id>
+    <sink_block_id>blocks_vector_to_stream_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>dtv_dvbt_reference_signals_0</source_block_id>
-    <sink_block_id>blocks_vector_to_stream_0</sink_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_vector_to_stream_0</source_block_id>
-    <sink_block_id>qtgui_const_sink_x_0</sink_block_id>
+    <source_block_id>dtv_dvbt_symbol_inner_interleaver_0</source_block_id>
+    <sink_block_id>dtv_dvbt_map_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_reed_solomon_enc_0</source_block_id>
-    <sink_block_id>dtv_dvbt_convolutional_interleaver_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>
diff --git a/gr-dtv/examples/vv003-cr23.grc b/gr-dtv/examples/vv003-cr23.grc
index ec2e572c8b..1b92b010de 100644
--- a/gr-dtv/examples/vv003-cr23.grc
+++ b/gr-dtv/examples/vv003-cr23.grc
@@ -1,327 +1,357 @@
-<?xml version='1.0' encoding='ASCII'?>
-<?grc format='1' created='3.7.7'?>
+<?xml version='1.0' encoding='utf-8'?>
+<?grc format='1' created='3.7.11'?>
 <flow_graph>
   <timestamp>Sun Dec 28 23:36:42 2014</timestamp>
   <block>
-    <key>dtv_dvbt2_framemapper_cc</key>
+    <key>options</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_framemapper_cc_0</value>
+      <key>author</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>window_size</key>
+      <value>1280, 1024</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>category</key>
+      <value>Custom</value>
     </param>
     <param>
-      <key>rate</key>
-      <value>C2_3</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_256QAM</value>
+      <key>description</key>
+      <value></value>
     </param>
     <param>
-      <key>rotation</key>
-      <value>ROTATION_ON</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>fecblocks</key>
-      <value>202</value>
+      <key>_coordinate</key>
+      <value>(8, 11)</value>
     </param>
     <param>
-      <key>tiblocks</key>
-      <value>3</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>carriermode</key>
-      <value>CARRIERS_EXTENDED</value>
+      <key>generate_options</key>
+      <value>wx_gui</value>
     </param>
     <param>
-      <key>fftsize1</key>
-      <value>FFTSIZE_32K_T2GI</value>
+      <key>hier_block_src_path</key>
+      <value>.:</value>
     </param>
     <param>
-      <key>fftsize2</key>
-      <value>FFTSIZE_2K</value>
+      <key>id</key>
+      <value>vv003_cr23</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_128</value>
+      <key>max_nouts</key>
+      <value>0</value>
     </param>
     <param>
-      <key>l1constellation</key>
-      <value>L1_MOD_64QAM</value>
+      <key>qt_qss_theme</key>
+      <value></value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP7</value>
+      <key>realtime_scheduling</key>
+      <value></value>
     </param>
     <param>
-      <key>t2frames</key>
-      <value>2</value>
+      <key>run_command</key>
+      <value>{python} -u {filename}</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>59</value>
+      <key>run_options</key>
+      <value>prompt</value>
     </param>
     <param>
-      <key>paprmode1</key>
-      <value>PAPR_OFF</value>
+      <key>run</key>
+      <value>True</value>
     </param>
     <param>
-      <key>paprmode2</key>
-      <value>PAPR_OFF</value>
+      <key>thread_safe_setters</key>
+      <value></value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>title</key>
+      <value></value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>inputmode</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>_coordinate</key>
+      <value>(8, 75)</value>
     </param>
     <param>
-      <key>reservedbiasbits</key>
-      <value>RESERVED_OFF</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>l1scrambled</key>
-      <value>L1_SCRAMBLED_OFF</value>
+      <key>id</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>inband</key>
-      <value>INBAND_OFF</value>
+      <key>value</key>
+      <value>(8000000.0 * 8) / 7</value>
+    </param>
+  </block>
+  <block>
+    <key>blocks_file_sink</key>
+    <param>
+      <key>append</key>
+      <value>False</value>
     </param>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>False</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>file</key>
+      <value>vv.cfile</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(734, 154)</value>
+      <value>(848, 420)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>blocks_file_sink_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
-      <value>(8000000.0 * 8) / 7</value>
+      <key>unbuffered</key>
+      <value>False</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_file_source</key>
     <param>
-      <key>_coordinate</key>
-      <value>(8, 75)</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>comment</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_freqinterleaver_cc</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_freqinterleaver_cc_0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>carriermode</key>
-      <value>CARRIERS_EXTENDED</value>
-    </param>
-    <param>
-      <key>fftsize</key>
-      <value>FFTSIZE_32K_T2GI</value>
+      <key>file</key>
+      <value>/run/shm/adv32k256qam.ts</value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP7</value>
+      <key>_coordinate</key>
+      <value>(120, 75)</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_128</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>59</value>
+      <key>id</key>
+      <value>blocks_file_source_0</value>
     </param>
     <param>
-      <key>paprmode1</key>
-      <value>PAPR_OFF</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>paprmode2</key>
-      <value>PAPR_OFF</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>repeat</key>
+      <value>True</value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_multiply_const_xx</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>const</key>
+      <value>0.2</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1013, 218)</value>
+      <value>(848, 540)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>options</key>
     <param>
       <key>id</key>
-      <value>vv003_cr23</value>
+      <value>blocks_multiply_const_xx_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>title</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>author</key>
-      <value></value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>description</key>
-      <value></value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
+      <key>cp_len</key>
+      <value>32768/128</value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>run_options</key>
-      <value>prompt</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>run</key>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>max_nouts</key>
+      <key>input_size</key>
+      <value>32768</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(344, 464)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
-      <value></value>
+      <key>id</key>
+      <value>digital_ofdm_cyclic_prefixer_0</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>tagname</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(8, 11)</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>rolloff</key>
       <value>0</value>
     </param>
   </block>
   <block>
-    <key>blocks_file_source</key>
+    <key>dtv_dvb_bbheader_bb</key>
     <param>
-      <key>id</key>
-      <value>blocks_file_source_0</value>
+      <key>mode</key>
+      <value>INPUTMODE_NORMAL</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>file</key>
-      <value>/run/shm/adv32k256qam.ts</value>
+      <key>rate1</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
+      <key>rate2</key>
+      <value>C1_3</value>
     </param>
     <param>
-      <key>repeat</key>
-      <value>True</value>
+      <key>rate3</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>rate5</key>
+      <value>C1_4</value>
+    </param>
+    <param>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -329,39 +359,63 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>fecblocks</key>
+      <value>168</value>
+    </param>
+    <param>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
+    </param>
+    <param>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(120, 75)</value>
+      <value>(360, 24)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_bbheader_bb</key>
     <param>
       <key>id</key>
       <value>dtv_dvb_bbheader_bb_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>inband</key>
+      <value>INBAND_OFF</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>rolloff</key>
+      <value>RO_0_35</value>
     </param>
     <param>
       <key>standard</key>
       <value>STANDARD_DVBT2</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>tsrate</key>
+      <value>4000000</value>
+    </param>
+  </block>
+  <block>
+    <key>dtv_dvb_bbscrambler_bb</key>
+    <param>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>rate1</key>
@@ -377,30 +431,14 @@
     </param>
     <param>
       <key>rate4</key>
-      <value>C1_4</value>
-    </param>
-    <param>
-      <key>rolloff</key>
-      <value>RO_0_35</value>
-    </param>
-    <param>
-      <key>mode</key>
-      <value>FECFRAME_SHORT</value>
-    </param>
-    <param>
-      <key>inband</key>
-      <value>INBAND_OFF</value>
-    </param>
-    <param>
-      <key>fecblocks</key>
-      <value>168</value>
+      <value>C1_5_MEDIUM</value>
     </param>
     <param>
-      <key>tsrate</key>
-      <value>4000000</value>
+      <key>rate5</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -408,39 +446,47 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
+    </param>
+    <param>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(352, 19)</value>
+      <value>(632, 36)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_bbscrambler_bb</key>
     <param>
       <key>id</key>
       <value>dtv_dvb_bbscrambler_bb_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>standard</key>
       <value>STANDARD_DVBT2</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvb_bch_bb</key>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>rate1</key>
@@ -456,10 +502,14 @@
     </param>
     <param>
       <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
+    </param>
+    <param>
+      <key>rate5</key>
       <value>C1_4</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -467,39 +517,47 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
+    </param>
+    <param>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(656, 35)</value>
+      <value>(856, 36)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_bch_bb</key>
     <param>
       <key>id</key>
       <value>dtv_dvb_bch_bb_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>standard</key>
       <value>STANDARD_DVBT2</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvb_ldpc_bb</key>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>rate1</key>
@@ -515,101 +573,145 @@
     </param>
     <param>
       <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
+    </param>
+    <param>
+      <key>rate5</key>
       <value>C1_4</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>constellation</key>
+      <value>MOD_OTHER</value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
+    </param>
+    <param>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(856, 35)</value>
+      <value>(1072, 36)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_ldpc_bb</key>
     <param>
       <key>id</key>
       <value>dtv_dvb_ldpc_bb_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>standard</key>
       <value>STANDARD_DVBT2</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_cellinterleaver_cc</key>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>rate1</key>
-      <value>C2_3</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>rate2</key>
-      <value>C1_3</value>
+      <key>constellation</key>
+      <value>MOD_256QAM</value>
     </param>
     <param>
-      <key>rate3</key>
-      <value>C1_4</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>rate4</key>
-      <value>C1_4</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_OTHER</value>
+      <key>fecblocks</key>
+      <value>202</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(504, 224)</value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
+      <key>id</key>
+      <value>dtv_dvbt2_cellinterleaver_cc_0</value>
+    </param>
+    <param>
       <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(1064, 35)</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>tiblocks</key>
+      <value>3</value>
     </param>
   </block>
   <block>
-    <key>dtv_dvbt2_pilotgenerator_cc</key>
+    <key>dtv_dvbt2_framemapper_cc</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_pilotgenerator_cc_0</value>
+      <key>inputmode</key>
+      <value>FECFRAME_NORMAL</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>rate</key>
+      <value>C2_3</value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>rotation</key>
+      <value>ROTATION_ON</value>
+    </param>
+    <param>
+      <key>constellation</key>
+      <value>MOD_256QAM</value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
@@ -620,106 +722,106 @@
       <value>CARRIERS_EXTENDED</value>
     </param>
     <param>
-      <key>fftsize</key>
-      <value>FFTSIZE_32K_T2GI</value>
+      <key>fecblocks</key>
+      <value>202</value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP7</value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_128</value>
+      <key>fftsize1</key>
+      <value>FFTSIZE_32K_T2GI</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>59</value>
+      <key>fftsize2</key>
+      <value>FFTSIZE_2K</value>
     </param>
     <param>
-      <key>paprmode1</key>
-      <value>PAPR_OFF</value>
+      <key>_coordinate</key>
+      <value>(736, 140)</value>
     </param>
     <param>
-      <key>paprmode2</key>
-      <value>PAPR_OFF</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>guardinterval</key>
+      <value>GI_1_128</value>
     </param>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>id</key>
+      <value>dtv_dvbt2_framemapper_cc_0</value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>inband</key>
+      <value>INBAND_OFF</value>
     </param>
     <param>
-      <key>misogroup</key>
-      <value>MISO_TX1</value>
+      <key>l1constellation</key>
+      <value>L1_MOD_64QAM</value>
     </param>
     <param>
-      <key>equalization</key>
-      <value>EQUALIZATION_ON</value>
+      <key>l1scrambled</key>
+      <value>L1_SCRAMBLED_OFF</value>
     </param>
     <param>
-      <key>bandwidth</key>
-      <value>BANDWIDTH_8_0_MHZ</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>numdatasyms</key>
+      <value>59</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>paprmode1</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>paprmode2</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(64, 459)</value>
+      <key>pilotpattern</key>
+      <value>PILOT_PP7</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
-  </block>
-  <block>
-    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
-      <key>id</key>
-      <value>digital_ofdm_cyclic_prefixer_0</value>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>reservedbiasbits</key>
+      <value>RESERVED_OFF</value>
     </param>
     <param>
-      <key>input_size</key>
-      <value>32768</value>
+      <key>version</key>
+      <value>VERSION_111</value>
     </param>
     <param>
-      <key>cp_len</key>
-      <value>32768/128</value>
+      <key>t2frames</key>
+      <value>2</value>
     </param>
     <param>
-      <key>rolloff</key>
-      <value>0</value>
+      <key>tiblocks</key>
+      <value>3</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_freqinterleaver_cc</key>
     <param>
-      <key>tagname</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -727,55 +829,56 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>carriermode</key>
+      <value>CARRIERS_EXTENDED</value>
+    </param>
+    <param>
+      <key>fftsize</key>
+      <value>FFTSIZE_32K_T2GI</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(344, 515)</value>
+      <value>(1016, 196)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_p1insertion_cc</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_p1insertion_cc_0</value>
+      <key>guardinterval</key>
+      <value>GI_1_128</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>id</key>
+      <value>dtv_dvbt2_freqinterleaver_cc_0</value>
     </param>
     <param>
-      <key>carriermode</key>
-      <value>CARRIERS_EXTENDED</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fftsize1</key>
-      <value>FFTSIZE_32K_T2GI</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fftsize2</key>
-      <value>FFTSIZE_2K</value>
+      <key>numdatasyms</key>
+      <value>59</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_128</value>
+      <key>paprmode1</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>59</value>
+      <key>paprmode2</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>pilotpattern</key>
+      <value>PILOT_PP7</value>
     </param>
     <param>
       <key>preamble1</key>
@@ -786,1167 +889,1186 @@
       <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>showlevels</key>
-      <value>SHOWLEVELS_OFF</value>
+      <key>version</key>
+      <value>VERSION_111</value>
+    </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_interleaver_bb</key>
+    <param>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>vclip</key>
-      <value>3.3</value>
+      <key>rate</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>constellation</key>
+      <value>MOD_256QAM</value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(560, 483)</value>
+      <value>(48, 228)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>blocks_multiply_const_vxx_0</value>
+      <value>dtv_dvbt2_interleaver_bb_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_modulator_bc</key>
     <param>
-      <key>const</key>
-      <value>0.2</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>rotation</key>
+      <value>ROTATION_ON</value>
+    </param>
+    <param>
+      <key>constellation</key>
+      <value>MOD_256QAM</value>
     </param>
     <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(864, 571)</value>
+      <value>(272, 228)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>osmosdr_sink</key>
     <param>
       <key>id</key>
-      <value>osmosdr_sink_0</value>
+      <value>dtv_dvbt2_modulator_bc_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>fc32</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_p1insertion_cc</key>
     <param>
-      <key>args</key>
-      <value>bladerf=0,buffers=128,buflen=32768</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>sync</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>num_mboards</key>
-      <value>1</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>clock_source0</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>time_source0</key>
-      <value></value>
+      <key>carriermode</key>
+      <value>CARRIERS_EXTENDED</value>
     </param>
     <param>
-      <key>clock_source1</key>
-      <value></value>
+      <key>fftsize1</key>
+      <value>FFTSIZE_32K_T2GI</value>
     </param>
     <param>
-      <key>time_source1</key>
-      <value></value>
+      <key>fftsize2</key>
+      <value>FFTSIZE_2K</value>
     </param>
     <param>
-      <key>clock_source2</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(560, 440)</value>
     </param>
     <param>
-      <key>time_source2</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>clock_source3</key>
-      <value></value>
+      <key>guardinterval</key>
+      <value>GI_1_128</value>
     </param>
     <param>
-      <key>time_source3</key>
-      <value></value>
+      <key>id</key>
+      <value>dtv_dvbt2_p1insertion_cc_0</value>
     </param>
     <param>
-      <key>clock_source4</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>time_source4</key>
-      <value></value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>clock_source5</key>
-      <value></value>
+      <key>numdatasyms</key>
+      <value>59</value>
     </param>
     <param>
-      <key>time_source5</key>
-      <value></value>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>clock_source6</key>
-      <value></value>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>time_source6</key>
-      <value></value>
+      <key>showlevels</key>
+      <value>SHOWLEVELS_OFF</value>
     </param>
     <param>
-      <key>clock_source7</key>
+      <key>version</key>
+      <value>VERSION_111</value>
+    </param>
+    <param>
+      <key>vclip</key>
+      <value>3.3</value>
+    </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_pilotgenerator_cc</key>
+    <param>
+      <key>bandwidth</key>
+      <value>BANDWIDTH_8_0_MHZ</value>
+    </param>
+    <param>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>time_source7</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>nchan</key>
-      <value>1</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>sample_rate</key>
-      <value>samp_rate</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>freq0</key>
-      <value>429e6</value>
+      <key>carriermode</key>
+      <value>CARRIERS_EXTENDED</value>
     </param>
     <param>
-      <key>corr0</key>
-      <value>0</value>
+      <key>fftsize</key>
+      <value>FFTSIZE_32K_T2GI</value>
     </param>
     <param>
-      <key>gain0</key>
-      <value>18</value>
+      <key>_coordinate</key>
+      <value>(56, 420)</value>
     </param>
     <param>
-      <key>if_gain0</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>bb_gain0</key>
-      <value>-8</value>
+      <key>guardinterval</key>
+      <value>GI_1_128</value>
     </param>
     <param>
-      <key>ant0</key>
-      <value></value>
+      <key>id</key>
+      <value>dtv_dvbt2_pilotgenerator_cc_0</value>
     </param>
     <param>
-      <key>bw0</key>
-      <value>8750000</value>
+      <key>misogroup</key>
+      <value>MISO_TX1</value>
     </param>
     <param>
-      <key>freq1</key>
-      <value>100e6</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>corr1</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain1</key>
-      <value>10</value>
+      <key>numdatasyms</key>
+      <value>59</value>
     </param>
     <param>
-      <key>if_gain1</key>
-      <value>20</value>
+      <key>paprmode1</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>bb_gain1</key>
-      <value>20</value>
+      <key>paprmode2</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>ant1</key>
-      <value></value>
+      <key>pilotpattern</key>
+      <value>PILOT_PP7</value>
     </param>
     <param>
-      <key>bw1</key>
-      <value>0</value>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>freq2</key>
-      <value>100e6</value>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>corr2</key>
-      <value>0</value>
+      <key>equalization</key>
+      <value>EQUALIZATION_ON</value>
     </param>
     <param>
-      <key>gain2</key>
-      <value>10</value>
+      <key>version</key>
+      <value>VERSION_111</value>
     </param>
+  </block>
+  <block>
+    <key>osmosdr_sink</key>
     <param>
-      <key>if_gain2</key>
-      <value>20</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain2</key>
-      <value>20</value>
+      <key>ant0</key>
+      <value></value>
     </param>
     <param>
-      <key>ant2</key>
-      <value></value>
+      <key>bb_gain0</key>
+      <value>-8</value>
     </param>
     <param>
-      <key>bw2</key>
+      <key>bw0</key>
+      <value>8750000</value>
+    </param>
+    <param>
+      <key>corr0</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq3</key>
-      <value>100e6</value>
+      <key>freq0</key>
+      <value>429e6</value>
     </param>
     <param>
-      <key>corr3</key>
+      <key>if_gain0</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain3</key>
-      <value>10</value>
+      <key>gain0</key>
+      <value>18</value>
     </param>
     <param>
-      <key>if_gain3</key>
-      <value>20</value>
+      <key>ant10</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain3</key>
+      <key>bb_gain10</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant3</key>
-      <value></value>
+      <key>bw10</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw3</key>
+      <key>corr10</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq4</key>
+      <key>freq10</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr4</key>
-      <value>0</value>
+      <key>if_gain10</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain4</key>
+      <key>gain10</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain4</key>
-      <value>20</value>
+      <key>ant11</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain4</key>
+      <key>bb_gain11</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant4</key>
-      <value></value>
+      <key>bw11</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw4</key>
+      <key>corr11</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq5</key>
+      <key>freq11</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr5</key>
-      <value>0</value>
+      <key>if_gain11</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain5</key>
+      <key>gain11</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain5</key>
-      <value>20</value>
+      <key>ant12</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain5</key>
+      <key>bb_gain12</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant5</key>
-      <value></value>
+      <key>bw12</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw5</key>
+      <key>corr12</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq6</key>
+      <key>freq12</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr6</key>
-      <value>0</value>
+      <key>if_gain12</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain6</key>
+      <key>gain12</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain6</key>
-      <value>20</value>
+      <key>ant13</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain6</key>
+      <key>bb_gain13</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant6</key>
-      <value></value>
+      <key>bw13</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw6</key>
+      <key>corr13</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq7</key>
+      <key>freq13</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr7</key>
-      <value>0</value>
+      <key>if_gain13</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain7</key>
+      <key>gain13</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain7</key>
-      <value>20</value>
+      <key>ant14</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain7</key>
+      <key>bb_gain14</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant7</key>
-      <value></value>
+      <key>bw14</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw7</key>
+      <key>corr14</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq8</key>
+      <key>freq14</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr8</key>
-      <value>0</value>
+      <key>if_gain14</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain8</key>
+      <key>gain14</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain8</key>
-      <value>20</value>
+      <key>ant15</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain8</key>
+      <key>bb_gain15</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant8</key>
-      <value></value>
+      <key>bw15</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw8</key>
+      <key>corr15</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq9</key>
+      <key>freq15</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr9</key>
-      <value>0</value>
+      <key>if_gain15</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain9</key>
+      <key>gain15</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain9</key>
-      <value>20</value>
+      <key>ant16</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain9</key>
+      <key>bb_gain16</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant9</key>
-      <value></value>
+      <key>bw16</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw9</key>
+      <key>corr16</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq10</key>
+      <key>freq16</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr10</key>
-      <value>0</value>
+      <key>if_gain16</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain10</key>
+      <key>gain16</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain10</key>
-      <value>20</value>
+      <key>ant17</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain10</key>
+      <key>bb_gain17</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant10</key>
-      <value></value>
+      <key>bw17</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw10</key>
+      <key>corr17</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq11</key>
+      <key>freq17</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr11</key>
-      <value>0</value>
+      <key>if_gain17</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain11</key>
+      <key>gain17</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain11</key>
-      <value>20</value>
+      <key>ant18</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain11</key>
+      <key>bb_gain18</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant11</key>
-      <value></value>
+      <key>bw18</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw11</key>
+      <key>corr18</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq12</key>
+      <key>freq18</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr12</key>
-      <value>0</value>
+      <key>if_gain18</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain12</key>
+      <key>gain18</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain12</key>
-      <value>20</value>
+      <key>ant19</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain12</key>
+      <key>bb_gain19</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant12</key>
-      <value></value>
+      <key>bw19</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw12</key>
+      <key>corr19</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq13</key>
+      <key>freq19</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr13</key>
-      <value>0</value>
+      <key>if_gain19</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain13</key>
+      <key>gain19</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain13</key>
-      <value>20</value>
+      <key>ant1</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain13</key>
+      <key>bb_gain1</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant13</key>
-      <value></value>
+      <key>bw1</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw13</key>
+      <key>corr1</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq14</key>
+      <key>freq1</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr14</key>
-      <value>0</value>
+      <key>if_gain1</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain14</key>
+      <key>gain1</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain14</key>
-      <value>20</value>
+      <key>ant20</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain14</key>
+      <key>bb_gain20</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant14</key>
-      <value></value>
+      <key>bw20</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw14</key>
+      <key>corr20</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq15</key>
+      <key>freq20</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr15</key>
-      <value>0</value>
+      <key>if_gain20</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain15</key>
+      <key>gain20</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain15</key>
-      <value>20</value>
+      <key>ant21</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain15</key>
+      <key>bb_gain21</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant15</key>
-      <value></value>
+      <key>bw21</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw15</key>
+      <key>corr21</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq16</key>
+      <key>freq21</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr16</key>
-      <value>0</value>
+      <key>if_gain21</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain16</key>
+      <key>gain21</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain16</key>
-      <value>20</value>
+      <key>ant22</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain16</key>
+      <key>bb_gain22</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant16</key>
-      <value></value>
+      <key>bw22</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw16</key>
+      <key>corr22</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq17</key>
+      <key>freq22</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr17</key>
-      <value>0</value>
+      <key>if_gain22</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain17</key>
+      <key>gain22</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain17</key>
-      <value>20</value>
+      <key>ant23</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain17</key>
+      <key>bb_gain23</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant17</key>
-      <value></value>
+      <key>bw23</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw17</key>
+      <key>corr23</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq18</key>
+      <key>freq23</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr18</key>
-      <value>0</value>
+      <key>if_gain23</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain18</key>
+      <key>gain23</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain18</key>
-      <value>20</value>
+      <key>ant24</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain18</key>
+      <key>bb_gain24</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant18</key>
-      <value></value>
+      <key>bw24</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw18</key>
+      <key>corr24</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq19</key>
+      <key>freq24</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr19</key>
-      <value>0</value>
+      <key>if_gain24</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain19</key>
+      <key>gain24</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain19</key>
-      <value>20</value>
+      <key>ant25</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain19</key>
+      <key>bb_gain25</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant19</key>
-      <value></value>
+      <key>bw25</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw19</key>
+      <key>corr25</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq20</key>
+      <key>freq25</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr20</key>
-      <value>0</value>
+      <key>if_gain25</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain20</key>
+      <key>gain25</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain20</key>
-      <value>20</value>
+      <key>ant26</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain20</key>
+      <key>bb_gain26</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant20</key>
-      <value></value>
+      <key>bw26</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw20</key>
+      <key>corr26</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq21</key>
+      <key>freq26</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr21</key>
-      <value>0</value>
+      <key>if_gain26</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain21</key>
+      <key>gain26</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain21</key>
-      <value>20</value>
+      <key>ant27</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain21</key>
+      <key>bb_gain27</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant21</key>
-      <value></value>
+      <key>bw27</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw21</key>
+      <key>corr27</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq22</key>
+      <key>freq27</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr22</key>
-      <value>0</value>
+      <key>if_gain27</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain22</key>
+      <key>gain27</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain22</key>
-      <value>20</value>
+      <key>ant28</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain22</key>
+      <key>bb_gain28</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant22</key>
-      <value></value>
+      <key>bw28</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw22</key>
+      <key>corr28</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq23</key>
+      <key>freq28</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr23</key>
-      <value>0</value>
+      <key>if_gain28</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain23</key>
+      <key>gain28</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain23</key>
-      <value>20</value>
+      <key>ant29</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain23</key>
+      <key>bb_gain29</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant23</key>
-      <value></value>
+      <key>bw29</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw23</key>
+      <key>corr29</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq24</key>
+      <key>freq29</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr24</key>
-      <value>0</value>
+      <key>if_gain29</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain24</key>
+      <key>gain29</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain24</key>
-      <value>20</value>
+      <key>ant2</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain24</key>
+      <key>bb_gain2</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant24</key>
-      <value></value>
+      <key>bw2</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw24</key>
+      <key>corr2</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq25</key>
+      <key>freq2</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr25</key>
-      <value>0</value>
+      <key>if_gain2</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain25</key>
+      <key>gain2</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain25</key>
-      <value>20</value>
+      <key>ant30</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain25</key>
+      <key>bb_gain30</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant25</key>
-      <value></value>
+      <key>bw30</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw25</key>
+      <key>corr30</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq26</key>
+      <key>freq30</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr26</key>
-      <value>0</value>
+      <key>if_gain30</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain26</key>
+      <key>gain30</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain26</key>
-      <value>20</value>
+      <key>ant31</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain26</key>
+      <key>bb_gain31</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant26</key>
-      <value></value>
+      <key>bw31</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw26</key>
+      <key>corr31</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq27</key>
+      <key>freq31</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr27</key>
-      <value>0</value>
+      <key>if_gain31</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain27</key>
+      <key>gain31</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain27</key>
-      <value>20</value>
+      <key>ant3</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain27</key>
+      <key>bb_gain3</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant27</key>
-      <value></value>
+      <key>bw3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw27</key>
+      <key>corr3</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq28</key>
+      <key>freq3</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr28</key>
-      <value>0</value>
+      <key>if_gain3</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain28</key>
+      <key>gain3</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain28</key>
-      <value>20</value>
+      <key>ant4</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain28</key>
+      <key>bb_gain4</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant28</key>
-      <value></value>
+      <key>bw4</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw28</key>
+      <key>corr4</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq29</key>
+      <key>freq4</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr29</key>
-      <value>0</value>
+      <key>if_gain4</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain29</key>
+      <key>gain4</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain29</key>
-      <value>20</value>
+      <key>ant5</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain29</key>
+      <key>bb_gain5</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant29</key>
-      <value></value>
+      <key>bw5</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw29</key>
+      <key>corr5</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq30</key>
+      <key>freq5</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr30</key>
-      <value>0</value>
+      <key>if_gain5</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain30</key>
+      <key>gain5</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain30</key>
-      <value>20</value>
+      <key>ant6</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain30</key>
+      <key>bb_gain6</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant30</key>
-      <value></value>
+      <key>bw6</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw30</key>
+      <key>corr6</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq31</key>
+      <key>freq6</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr31</key>
-      <value>0</value>
+      <key>if_gain6</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain31</key>
+      <key>gain6</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain31</key>
-      <value>20</value>
+      <key>ant7</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain31</key>
+      <key>bb_gain7</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant31</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bw31</key>
+      <key>bw7</key>
       <value>0</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
+      <key>corr7</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(1048, 483)</value>
+      <key>freq7</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>if_gain7</key>
+      <value>20</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_file_sink</key>
     <param>
-      <key>id</key>
-      <value>blocks_file_sink_0</value>
+      <key>gain7</key>
+      <value>10</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>False</value>
+      <key>ant8</key>
+      <value></value>
     </param>
     <param>
-      <key>file</key>
-      <value>vv.cfile</value>
+      <key>bb_gain8</key>
+      <value>20</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>bw8</key>
+      <value>0</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>corr8</key>
+      <value>0</value>
     </param>
     <param>
-      <key>unbuffered</key>
-      <value>False</value>
+      <key>freq8</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>append</key>
-      <value>False</value>
+      <key>if_gain8</key>
+      <value>20</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>gain8</key>
+      <value>10</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>ant9</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(864, 475)</value>
+      <key>bb_gain9</key>
+      <value>20</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>bw9</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_interleaver_bb</key>
-    <param>
-      <key>id</key>
-      <value>dtv_dvbt2_interleaver_bb_0</value>
-    </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>corr9</key>
+      <value>0</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>freq9</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>rate</key>
-      <value>C2_3</value>
+      <key>if_gain9</key>
+      <value>20</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_256QAM</value>
+      <key>gain9</key>
+      <value>10</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -1954,165 +2076,155 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>args</key>
+      <value>bladerf=0,buffers=128,buflen=32768</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(48, 219)</value>
+      <value>(1056, 428)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_modulator_bc</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt2_modulator_bc_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <value>osmosdr_sink_0</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>type</key>
+      <value>fc32</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_256QAM</value>
+      <key>clock_source0</key>
+      <value></value>
     </param>
     <param>
-      <key>rotation</key>
-      <value>ROTATION_ON</value>
+      <key>time_source0</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>clock_source1</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>time_source1</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>clock_source2</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>time_source2</key>
+      <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(264, 219)</value>
+      <key>clock_source3</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>time_source3</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_cellinterleaver_cc</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_cellinterleaver_cc_0</value>
+      <key>clock_source4</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>time_source4</key>
+      <value></value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>clock_source5</key>
+      <value></value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_256QAM</value>
+      <key>time_source5</key>
+      <value></value>
     </param>
     <param>
-      <key>fecblocks</key>
-      <value>202</value>
+      <key>clock_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>tiblocks</key>
-      <value>3</value>
+      <key>time_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>clock_source7</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>time_source7</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>nchan</key>
+      <value>1</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>num_mboards</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(504, 211)</value>
+      <key>sample_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>sync</key>
+      <value></value>
     </param>
   </block>
   <connection>
-    <source_block_id>dtv_dvb_bch_bb_0</source_block_id>
-    <sink_block_id>dtv_dvb_ldpc_bb_0</sink_block_id>
+    <source_block_id>blocks_file_source_0</source_block_id>
+    <sink_block_id>dtv_dvb_bbheader_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvb_bbscrambler_bb_0</source_block_id>
-    <sink_block_id>dtv_dvb_bch_bb_0</sink_block_id>
+    <source_block_id>blocks_multiply_const_xx_0</source_block_id>
+    <sink_block_id>osmosdr_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvb_ldpc_bb_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_interleaver_bb_0</sink_block_id>
+    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_p1insertion_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_interleaver_bb_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_modulator_bc_0</sink_block_id>
+    <source_block_id>dtv_dvb_bbheader_bb_0</source_block_id>
+    <sink_block_id>dtv_dvb_bbscrambler_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_modulator_bc_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_cellinterleaver_cc_0</sink_block_id>
+    <source_block_id>dtv_dvb_bbscrambler_bb_0</source_block_id>
+    <sink_block_id>dtv_dvb_bch_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_cellinterleaver_cc_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_framemapper_cc_0</sink_block_id>
+    <source_block_id>dtv_dvb_bch_bb_0</source_block_id>
+    <sink_block_id>dtv_dvb_ldpc_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvb_bbheader_bb_0</source_block_id>
-    <sink_block_id>dtv_dvb_bbscrambler_bb_0</sink_block_id>
+    <source_block_id>dtv_dvb_ldpc_bb_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_interleaver_bb_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>dtv_dvb_bbheader_bb_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_cellinterleaver_cc_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_framemapper_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2129,32 +2241,32 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_p1insertion_cc_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_interleaver_bb_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_modulator_bc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_pilotgenerator_cc_0</source_block_id>
-    <sink_block_id>digital_ofdm_cyclic_prefixer_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_modulator_bc_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_cellinterleaver_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>dtv_dvbt2_p1insertion_cc_0</source_block_id>
-    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
+    <sink_block_id>blocks_file_sink_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>osmosdr_sink_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_p1insertion_cc_0</source_block_id>
+    <sink_block_id>blocks_multiply_const_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_p1insertion_cc_0</source_block_id>
-    <sink_block_id>blocks_file_sink_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_pilotgenerator_cc_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>
diff --git a/gr-dtv/examples/vv009-4kfft.grc b/gr-dtv/examples/vv009-4kfft.grc
index d50222980f..dfc9350b10 100644
--- a/gr-dtv/examples/vv009-4kfft.grc
+++ b/gr-dtv/examples/vv009-4kfft.grc
@@ -1,23 +1,23 @@
-<?xml version='1.0' encoding='ASCII'?>
-<?grc format='1' created='3.7.7'?>
+<?xml version='1.0' encoding='utf-8'?>
+<?grc format='1' created='3.7.11'?>
 <flow_graph>
   <timestamp>Mon Dec 29 00:00:54 2014</timestamp>
   <block>
     <key>options</key>
     <param>
-      <key>id</key>
-      <value>vv009_4kfft</value>
+      <key>author</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>window_size</key>
+      <value>1280, 1024</value>
     </param>
     <param>
-      <key>title</key>
-      <value></value>
+      <key>category</key>
+      <value>Custom</value>
     </param>
     <param>
-      <key>author</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -25,16 +25,44 @@
       <value></value>
     </param>
     <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(8, 11)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
       <key>generate_options</key>
       <value>wx_gui</value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>hier_block_src_path</key>
+      <value>.:</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>vv009_4kfft</value>
+    </param>
+    <param>
+      <key>max_nouts</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>qt_qss_theme</key>
+      <value></value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>run_command</key>
+      <value>{python} -u {filename}</value>
     </param>
     <param>
       <key>run_options</key>
@@ -45,58 +73,105 @@
       <value>True</value>
     </param>
     <param>
-      <key>max_nouts</key>
-      <value>0</value>
+      <key>thread_safe_setters</key>
+      <value></value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
+      <key>title</key>
       <value></value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(8, 11)</value>
+      <value>(8, 75)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
       <key>id</key>
       <value>samp_rate</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
       <key>value</key>
       <value>(8000000.0 * 8) / 7</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_file_sink</key>
+    <param>
+      <key>append</key>
+      <value>False</value>
+    </param>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>file</key>
+      <value>vv.cfile</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(8, 75)</value>
+      <value>(832, 420)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
+    <param>
+      <key>id</key>
+      <value>blocks_file_sink_0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>unbuffered</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
   </block>
   <block>
     <key>blocks_file_source</key>
     <param>
-      <key>id</key>
-      <value>blocks_file_source_0</value>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
@@ -107,6 +182,26 @@
       <value>/run/shm/adv4k64qam.ts</value>
     </param>
     <param>
+      <key>_coordinate</key>
+      <value>(120, 75)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>blocks_file_source_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>type</key>
       <value>byte</value>
     </param>
@@ -118,71 +213,70 @@
       <key>vlen</key>
       <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_multiply_const_xx</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>const</key>
+      <value>0.2</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(120, 75)</value>
+      <value>(832, 540)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_ldpc_bb</key>
     <param>
       <key>id</key>
-      <value>dtv_dvb_ldpc_bb_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>standard</key>
-      <value>STANDARD_DVBT2</value>
+      <value>blocks_multiply_const_xx_0</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>rate1</key>
-      <value>C2_3</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>rate2</key>
-      <value>C1_3</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>rate3</key>
-      <value>C1_4</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
-      <key>rate4</key>
-      <value>C1_4</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_OTHER</value>
+      <key>cp_len</key>
+      <value>4096/32</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -190,39 +284,51 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>input_size</key>
+      <value>4096</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1056, 35)</value>
+      <value>(336, 464)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_bch_bb</key>
     <param>
       <key>id</key>
-      <value>dtv_dvb_bch_bb_0</value>
+      <value>digital_ofdm_cyclic_prefixer_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>tagname</key>
+      <value></value>
     </param>
     <param>
-      <key>standard</key>
-      <value>STANDARD_DVBT2</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>rolloff</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>dtv_dvb_bbheader_bb</key>
+    <param>
+      <key>mode</key>
+      <value>INPUTMODE_NORMAL</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>rate1</key>
@@ -238,10 +344,14 @@
     </param>
     <param>
       <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
+    </param>
+    <param>
+      <key>rate5</key>
       <value>C1_4</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -249,39 +359,63 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>fecblocks</key>
+      <value>168</value>
+    </param>
+    <param>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
+    </param>
+    <param>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(840, 35)</value>
+      <value>(360, 24)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_bbscrambler_bb</key>
     <param>
       <key>id</key>
-      <value>dtv_dvb_bbscrambler_bb_0</value>
+      <value>dtv_dvb_bbheader_bb_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>inband</key>
+      <value>INBAND_OFF</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>rolloff</key>
+      <value>RO_0_35</value>
     </param>
     <param>
       <key>standard</key>
       <value>STANDARD_DVBT2</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>tsrate</key>
+      <value>4000000</value>
+    </param>
+  </block>
+  <block>
+    <key>dtv_dvb_bbscrambler_bb</key>
+    <param>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>rate1</key>
@@ -297,10 +431,14 @@
     </param>
     <param>
       <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
+    </param>
+    <param>
+      <key>rate5</key>
       <value>C1_4</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -308,39 +446,47 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
+    </param>
+    <param>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(624, 35)</value>
+      <value>(632, 36)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_bbheader_bb</key>
     <param>
       <key>id</key>
-      <value>dtv_dvb_bbheader_bb_0</value>
+      <value>dtv_dvb_bbscrambler_bb_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>standard</key>
       <value>STANDARD_DVBT2</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvb_bch_bb</key>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>rate1</key>
@@ -356,196 +502,216 @@
     </param>
     <param>
       <key>rate4</key>
-      <value>C1_4</value>
+      <value>C1_5_MEDIUM</value>
     </param>
     <param>
-      <key>rolloff</key>
-      <value>RO_0_35</value>
+      <key>rate5</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>mode</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>inband</key>
-      <value>INBAND_OFF</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>fecblocks</key>
-      <value>168</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>tsrate</key>
-      <value>4000000</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(856, 36)</value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
+      <key>id</key>
+      <value>dtv_dvb_bch_bb_0</value>
+    </param>
+    <param>
       <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(360, 19)</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>standard</key>
+      <value>STANDARD_DVBT2</value>
     </param>
   </block>
   <block>
-    <key>dtv_dvbt2_pilotgenerator_cc</key>
+    <key>dtv_dvb_ldpc_bb</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_pilotgenerator_cc_0</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>rate1</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>carriermode</key>
-      <value>CARRIERS_NORMAL</value>
+      <key>rate2</key>
+      <value>C1_3</value>
     </param>
     <param>
-      <key>fftsize</key>
-      <value>FFTSIZE_4K</value>
+      <key>rate3</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP7</value>
+      <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_32</value>
+      <key>rate5</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>100</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>paprmode1</key>
-      <value>PAPR_OFF</value>
+      <key>constellation</key>
+      <value>MOD_OTHER</value>
     </param>
     <param>
-      <key>paprmode2</key>
-      <value>PAPR_OFF</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>misogroup</key>
-      <value>MISO_TX1</value>
+      <key>_coordinate</key>
+      <value>(1072, 36)</value>
     </param>
     <param>
-      <key>equalization</key>
-      <value>EQUALIZATION_ON</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bandwidth</key>
-      <value>BANDWIDTH_8_0_MHZ</value>
+      <key>id</key>
+      <value>dtv_dvb_ldpc_bb_0</value>
     </param>
     <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>standard</key>
+      <value>STANDARD_DVBT2</value>
+    </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_cellinterleaver_cc</key>
+    <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>constellation</key>
+      <value>MOD_64QAM</value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>fecblocks</key>
+      <value>31</value>
+    </param>
+    <param>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(56, 451)</value>
+      <value>(504, 224)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
       <key>id</key>
-      <value>digital_ofdm_cyclic_prefixer_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <value>dtv_dvbt2_cellinterleaver_cc_0</value>
     </param>
     <param>
-      <key>input_size</key>
-      <value>4096</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>cp_len</key>
-      <value>4096/32</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>rolloff</key>
-      <value>0</value>
+      <key>tiblocks</key>
+      <value>3</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_framemapper_cc</key>
     <param>
-      <key>tagname</key>
-      <value></value>
+      <key>inputmode</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>rate</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>rotation</key>
+      <value>ROTATION_ON</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(328, 507)</value>
+      <key>constellation</key>
+      <value>MOD_64QAM</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_p1insertion_cc</key>
-    <param>
-      <key>id</key>
-      <value>dtv_dvbt2_p1insertion_cc_0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
@@ -556,489 +722,497 @@
       <value>CARRIERS_NORMAL</value>
     </param>
     <param>
-      <key>fftsize1</key>
-      <value>FFTSIZE_4K</value>
-    </param>
-    <param>
-      <key>fftsize2</key>
-      <value>FFTSIZE_2K</value>
+      <key>fecblocks</key>
+      <value>31</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_32</value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>100</value>
+      <key>fftsize1</key>
+      <value>FFTSIZE_4K</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>fftsize2</key>
+      <value>FFTSIZE_2K</value>
     </param>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>_coordinate</key>
+      <value>(744, 140)</value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>showlevels</key>
-      <value>SHOWLEVELS_OFF</value>
+      <key>guardinterval</key>
+      <value>GI_1_32</value>
     </param>
     <param>
-      <key>vclip</key>
-      <value>3.3</value>
+      <key>id</key>
+      <value>dtv_dvbt2_framemapper_cc_0</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>inband</key>
+      <value>INBAND_OFF</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>l1constellation</key>
+      <value>L1_MOD_16QAM</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>l1scrambled</key>
+      <value>L1_SCRAMBLED_OFF</value>
     </param>
     <param>
       <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(552, 475)</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>numdatasyms</key>
+      <value>100</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_multiply_const_vxx</key>
     <param>
-      <key>id</key>
-      <value>blocks_multiply_const_vxx_0</value>
+      <key>paprmode1</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>paprmode2</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>pilotpattern</key>
+      <value>PILOT_PP7</value>
     </param>
     <param>
-      <key>const</key>
-      <value>0.2</value>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>reservedbiasbits</key>
+      <value>RESERVED_OFF</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>version</key>
+      <value>VERSION_111</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>t2frames</key>
+      <value>2</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>tiblocks</key>
+      <value>3</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_freqinterleaver_cc</key>
     <param>
-      <key>_coordinate</key>
-      <value>(832, 563)</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>comment</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>osmosdr_sink</key>
     <param>
-      <key>id</key>
-      <value>osmosdr_sink_0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>fc32</value>
+      <key>carriermode</key>
+      <value>CARRIERS_NORMAL</value>
     </param>
     <param>
-      <key>args</key>
-      <value>bladerf=0,buffers=128,buflen=32768</value>
+      <key>fftsize</key>
+      <value>FFTSIZE_4K</value>
     </param>
     <param>
-      <key>sync</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(1024, 196)</value>
     </param>
     <param>
-      <key>num_mboards</key>
-      <value>1</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>clock_source0</key>
-      <value></value>
+      <key>guardinterval</key>
+      <value>GI_1_32</value>
     </param>
     <param>
-      <key>time_source0</key>
-      <value></value>
+      <key>id</key>
+      <value>dtv_dvbt2_freqinterleaver_cc_0</value>
     </param>
     <param>
-      <key>clock_source1</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>time_source1</key>
-      <value></value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>clock_source2</key>
-      <value></value>
+      <key>numdatasyms</key>
+      <value>100</value>
     </param>
     <param>
-      <key>time_source2</key>
-      <value></value>
+      <key>paprmode1</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>clock_source3</key>
-      <value></value>
+      <key>paprmode2</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>time_source3</key>
-      <value></value>
+      <key>pilotpattern</key>
+      <value>PILOT_PP7</value>
     </param>
     <param>
-      <key>clock_source4</key>
-      <value></value>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>time_source4</key>
-      <value></value>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>clock_source5</key>
-      <value></value>
+      <key>version</key>
+      <value>VERSION_111</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_interleaver_bb</key>
     <param>
-      <key>time_source5</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>clock_source6</key>
-      <value></value>
+      <key>rate</key>
+      <value>C2_3</value>
     </param>
     <param>
-      <key>time_source6</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>clock_source7</key>
-      <value></value>
+      <key>constellation</key>
+      <value>MOD_64QAM</value>
     </param>
     <param>
-      <key>time_source7</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>nchan</key>
-      <value>1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>sample_rate</key>
-      <value>samp_rate</value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>freq0</key>
-      <value>429e6</value>
+      <key>_coordinate</key>
+      <value>(48, 228)</value>
     </param>
     <param>
-      <key>corr0</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain0</key>
-      <value>18</value>
+      <key>id</key>
+      <value>dtv_dvbt2_interleaver_bb_0</value>
     </param>
     <param>
-      <key>if_gain0</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>bb_gain0</key>
-      <value>-8</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_modulator_bc</key>
     <param>
-      <key>ant0</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>bw0</key>
-      <value>8750000</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>freq1</key>
-      <value>100e6</value>
+      <key>rotation</key>
+      <value>ROTATION_ON</value>
     </param>
     <param>
-      <key>corr1</key>
-      <value>0</value>
+      <key>constellation</key>
+      <value>MOD_64QAM</value>
     </param>
     <param>
-      <key>gain1</key>
-      <value>10</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>if_gain1</key>
-      <value>20</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>bb_gain1</key>
-      <value>20</value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>ant1</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(272, 228)</value>
     </param>
     <param>
-      <key>bw1</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq2</key>
-      <value>100e6</value>
+      <key>id</key>
+      <value>dtv_dvbt2_modulator_bc_0</value>
     </param>
     <param>
-      <key>corr2</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain2</key>
-      <value>10</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_p1insertion_cc</key>
     <param>
-      <key>if_gain2</key>
-      <value>20</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain2</key>
-      <value>20</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>ant2</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>bw2</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>freq3</key>
-      <value>100e6</value>
+      <key>carriermode</key>
+      <value>CARRIERS_NORMAL</value>
     </param>
     <param>
-      <key>corr3</key>
-      <value>0</value>
+      <key>fftsize1</key>
+      <value>FFTSIZE_4K</value>
     </param>
     <param>
-      <key>gain3</key>
-      <value>10</value>
+      <key>fftsize2</key>
+      <value>FFTSIZE_2K</value>
     </param>
     <param>
-      <key>if_gain3</key>
-      <value>20</value>
+      <key>_coordinate</key>
+      <value>(560, 440)</value>
     </param>
     <param>
-      <key>bb_gain3</key>
-      <value>20</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>ant3</key>
-      <value></value>
+      <key>guardinterval</key>
+      <value>GI_1_32</value>
     </param>
     <param>
-      <key>bw3</key>
-      <value>0</value>
+      <key>id</key>
+      <value>dtv_dvbt2_p1insertion_cc_0</value>
     </param>
     <param>
-      <key>freq4</key>
-      <value>100e6</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>corr4</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain4</key>
-      <value>10</value>
+      <key>numdatasyms</key>
+      <value>100</value>
     </param>
     <param>
-      <key>if_gain4</key>
-      <value>20</value>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>bb_gain4</key>
-      <value>20</value>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>ant4</key>
-      <value></value>
+      <key>showlevels</key>
+      <value>SHOWLEVELS_OFF</value>
     </param>
     <param>
-      <key>bw4</key>
-      <value>0</value>
+      <key>version</key>
+      <value>VERSION_111</value>
     </param>
     <param>
-      <key>freq5</key>
-      <value>100e6</value>
+      <key>vclip</key>
+      <value>3.3</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_pilotgenerator_cc</key>
     <param>
-      <key>corr5</key>
-      <value>0</value>
+      <key>bandwidth</key>
+      <value>BANDWIDTH_8_0_MHZ</value>
     </param>
     <param>
-      <key>gain5</key>
-      <value>10</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>if_gain5</key>
-      <value>20</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain5</key>
-      <value>20</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>ant5</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>bw5</key>
-      <value>0</value>
+      <key>carriermode</key>
+      <value>CARRIERS_NORMAL</value>
     </param>
     <param>
-      <key>freq6</key>
-      <value>100e6</value>
+      <key>fftsize</key>
+      <value>FFTSIZE_4K</value>
     </param>
     <param>
-      <key>corr6</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(56, 420)</value>
     </param>
     <param>
-      <key>gain6</key>
-      <value>10</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>if_gain6</key>
-      <value>20</value>
+      <key>guardinterval</key>
+      <value>GI_1_32</value>
     </param>
     <param>
-      <key>bb_gain6</key>
-      <value>20</value>
+      <key>id</key>
+      <value>dtv_dvbt2_pilotgenerator_cc_0</value>
     </param>
     <param>
-      <key>ant6</key>
-      <value></value>
+      <key>misogroup</key>
+      <value>MISO_TX1</value>
     </param>
     <param>
-      <key>bw6</key>
+      <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq7</key>
-      <value>100e6</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>corr7</key>
-      <value>0</value>
+      <key>numdatasyms</key>
+      <value>100</value>
     </param>
     <param>
-      <key>gain7</key>
-      <value>10</value>
+      <key>paprmode1</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>if_gain7</key>
-      <value>20</value>
+      <key>paprmode2</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>bb_gain7</key>
-      <value>20</value>
+      <key>pilotpattern</key>
+      <value>PILOT_PP7</value>
     </param>
     <param>
-      <key>ant7</key>
-      <value></value>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>bw7</key>
-      <value>0</value>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>freq8</key>
-      <value>100e6</value>
+      <key>equalization</key>
+      <value>EQUALIZATION_ON</value>
     </param>
     <param>
-      <key>corr8</key>
-      <value>0</value>
+      <key>version</key>
+      <value>VERSION_111</value>
     </param>
+  </block>
+  <block>
+    <key>osmosdr_sink</key>
     <param>
-      <key>gain8</key>
-      <value>10</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>if_gain8</key>
-      <value>20</value>
+      <key>ant0</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain8</key>
-      <value>20</value>
+      <key>bb_gain0</key>
+      <value>-8</value>
     </param>
     <param>
-      <key>ant8</key>
-      <value></value>
+      <key>bw0</key>
+      <value>8750000</value>
     </param>
     <param>
-      <key>bw8</key>
+      <key>corr0</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq9</key>
-      <value>100e6</value>
+      <key>freq0</key>
+      <value>429e6</value>
     </param>
     <param>
-      <key>corr9</key>
+      <key>if_gain0</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain9</key>
-      <value>10</value>
+      <key>gain0</key>
+      <value>18</value>
     </param>
     <param>
-      <key>if_gain9</key>
-      <value>20</value>
+      <key>ant10</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain9</key>
+      <key>bb_gain10</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant9</key>
-      <value></value>
+      <key>bw10</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw9</key>
+      <key>corr10</key>
       <value>0</value>
     </param>
     <param>
@@ -1046,27 +1220,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr10</key>
-      <value>0</value>
+      <key>if_gain10</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain10</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain10</key>
-      <value>20</value>
+      <key>ant11</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain10</key>
+      <key>bb_gain11</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant10</key>
-      <value></value>
+      <key>bw11</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw10</key>
+      <key>corr11</key>
       <value>0</value>
     </param>
     <param>
@@ -1074,27 +1248,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr11</key>
-      <value>0</value>
+      <key>if_gain11</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain11</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain11</key>
-      <value>20</value>
+      <key>ant12</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain11</key>
+      <key>bb_gain12</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant11</key>
-      <value></value>
+      <key>bw12</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw11</key>
+      <key>corr12</key>
       <value>0</value>
     </param>
     <param>
@@ -1102,27 +1276,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr12</key>
-      <value>0</value>
+      <key>if_gain12</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain12</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain12</key>
-      <value>20</value>
+      <key>ant13</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain12</key>
+      <key>bb_gain13</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant12</key>
-      <value></value>
+      <key>bw13</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw12</key>
+      <key>corr13</key>
       <value>0</value>
     </param>
     <param>
@@ -1130,27 +1304,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr13</key>
-      <value>0</value>
+      <key>if_gain13</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain13</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain13</key>
-      <value>20</value>
+      <key>ant14</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain13</key>
+      <key>bb_gain14</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant13</key>
-      <value></value>
+      <key>bw14</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw13</key>
+      <key>corr14</key>
       <value>0</value>
     </param>
     <param>
@@ -1158,27 +1332,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr14</key>
-      <value>0</value>
+      <key>if_gain14</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain14</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain14</key>
-      <value>20</value>
+      <key>ant15</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain14</key>
+      <key>bb_gain15</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant14</key>
-      <value></value>
+      <key>bw15</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw14</key>
+      <key>corr15</key>
       <value>0</value>
     </param>
     <param>
@@ -1186,27 +1360,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr15</key>
-      <value>0</value>
+      <key>if_gain15</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain15</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain15</key>
-      <value>20</value>
+      <key>ant16</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain15</key>
+      <key>bb_gain16</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant15</key>
-      <value></value>
+      <key>bw16</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw15</key>
+      <key>corr16</key>
       <value>0</value>
     </param>
     <param>
@@ -1214,27 +1388,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr16</key>
-      <value>0</value>
+      <key>if_gain16</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain16</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain16</key>
-      <value>20</value>
+      <key>ant17</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain16</key>
+      <key>bb_gain17</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant16</key>
-      <value></value>
+      <key>bw17</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw16</key>
+      <key>corr17</key>
       <value>0</value>
     </param>
     <param>
@@ -1242,27 +1416,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr17</key>
-      <value>0</value>
+      <key>if_gain17</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain17</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain17</key>
-      <value>20</value>
+      <key>ant18</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain17</key>
+      <key>bb_gain18</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant17</key>
-      <value></value>
+      <key>bw18</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw17</key>
+      <key>corr18</key>
       <value>0</value>
     </param>
     <param>
@@ -1270,27 +1444,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr18</key>
-      <value>0</value>
+      <key>if_gain18</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain18</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain18</key>
-      <value>20</value>
+      <key>ant19</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain18</key>
+      <key>bb_gain19</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant18</key>
-      <value></value>
+      <key>bw19</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw18</key>
+      <key>corr19</key>
       <value>0</value>
     </param>
     <param>
@@ -1298,27 +1472,55 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr19</key>
-      <value>0</value>
+      <key>if_gain19</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain19</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain19</key>
+      <key>ant1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>bb_gain1</key>
       <value>20</value>
     </param>
     <param>
-      <key>bb_gain19</key>
+      <key>bw1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>corr1</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>freq1</key>
+      <value>100e6</value>
+    </param>
+    <param>
+      <key>if_gain1</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant19</key>
+      <key>gain1</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ant20</key>
       <value></value>
     </param>
     <param>
-      <key>bw19</key>
+      <key>bb_gain20</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>bw20</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>corr20</key>
       <value>0</value>
     </param>
     <param>
@@ -1326,27 +1528,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr20</key>
-      <value>0</value>
+      <key>if_gain20</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain20</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain20</key>
-      <value>20</value>
+      <key>ant21</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain20</key>
+      <key>bb_gain21</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant20</key>
-      <value></value>
+      <key>bw21</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw20</key>
+      <key>corr21</key>
       <value>0</value>
     </param>
     <param>
@@ -1354,27 +1556,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr21</key>
-      <value>0</value>
+      <key>if_gain21</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain21</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain21</key>
-      <value>20</value>
+      <key>ant22</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain21</key>
+      <key>bb_gain22</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant21</key>
-      <value></value>
+      <key>bw22</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw21</key>
+      <key>corr22</key>
       <value>0</value>
     </param>
     <param>
@@ -1382,27 +1584,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr22</key>
-      <value>0</value>
+      <key>if_gain22</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain22</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain22</key>
-      <value>20</value>
+      <key>ant23</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain22</key>
+      <key>bb_gain23</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant22</key>
-      <value></value>
+      <key>bw23</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw22</key>
+      <key>corr23</key>
       <value>0</value>
     </param>
     <param>
@@ -1410,27 +1612,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr23</key>
-      <value>0</value>
+      <key>if_gain23</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain23</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain23</key>
-      <value>20</value>
+      <key>ant24</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain23</key>
+      <key>bb_gain24</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant23</key>
-      <value></value>
+      <key>bw24</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw23</key>
+      <key>corr24</key>
       <value>0</value>
     </param>
     <param>
@@ -1438,27 +1640,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr24</key>
-      <value>0</value>
+      <key>if_gain24</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain24</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain24</key>
-      <value>20</value>
+      <key>ant25</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain24</key>
+      <key>bb_gain25</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant24</key>
-      <value></value>
+      <key>bw25</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw24</key>
+      <key>corr25</key>
       <value>0</value>
     </param>
     <param>
@@ -1466,27 +1668,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr25</key>
-      <value>0</value>
+      <key>if_gain25</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain25</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain25</key>
-      <value>20</value>
+      <key>ant26</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain25</key>
+      <key>bb_gain26</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant25</key>
-      <value></value>
+      <key>bw26</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw25</key>
+      <key>corr26</key>
       <value>0</value>
     </param>
     <param>
@@ -1494,27 +1696,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr26</key>
-      <value>0</value>
+      <key>if_gain26</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain26</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain26</key>
-      <value>20</value>
+      <key>ant27</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain26</key>
+      <key>bb_gain27</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant26</key>
-      <value></value>
+      <key>bw27</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw26</key>
+      <key>corr27</key>
       <value>0</value>
     </param>
     <param>
@@ -1522,27 +1724,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr27</key>
-      <value>0</value>
+      <key>if_gain27</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain27</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain27</key>
-      <value>20</value>
+      <key>ant28</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain27</key>
+      <key>bb_gain28</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant27</key>
-      <value></value>
+      <key>bw28</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw27</key>
+      <key>corr28</key>
       <value>0</value>
     </param>
     <param>
@@ -1550,27 +1752,27 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr28</key>
-      <value>0</value>
+      <key>if_gain28</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain28</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain28</key>
-      <value>20</value>
+      <key>ant29</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain28</key>
+      <key>bb_gain29</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant28</key>
-      <value></value>
+      <key>bw29</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw28</key>
+      <key>corr29</key>
       <value>0</value>
     </param>
     <param>
@@ -1578,375 +1780,295 @@
       <value>100e6</value>
     </param>
     <param>
-      <key>corr29</key>
-      <value>0</value>
+      <key>if_gain29</key>
+      <value>20</value>
     </param>
     <param>
       <key>gain29</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain29</key>
-      <value>20</value>
+      <key>ant2</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain29</key>
+      <key>bb_gain2</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant29</key>
-      <value></value>
+      <key>bw2</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw29</key>
+      <key>corr2</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq30</key>
+      <key>freq2</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr30</key>
-      <value>0</value>
+      <key>if_gain2</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain30</key>
+      <key>gain2</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain30</key>
-      <value>20</value>
+      <key>ant30</key>
+      <value></value>
     </param>
     <param>
       <key>bb_gain30</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant30</key>
-      <value></value>
+      <key>bw30</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw30</key>
+      <key>corr30</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq31</key>
+      <key>freq30</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr31</key>
-      <value>0</value>
+      <key>if_gain30</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain31</key>
+      <key>gain30</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain31</key>
-      <value>20</value>
+      <key>ant31</key>
+      <value></value>
     </param>
     <param>
       <key>bb_gain31</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant31</key>
-      <value></value>
-    </param>
-    <param>
       <key>bw31</key>
       <value>0</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(1024, 467)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
+      <key>corr31</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_framemapper_cc</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_framemapper_cc_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>freq31</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>rate</key>
-      <value>C2_3</value>
+      <key>if_gain31</key>
+      <value>20</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_64QAM</value>
+      <key>gain31</key>
+      <value>10</value>
     </param>
     <param>
-      <key>rotation</key>
-      <value>ROTATION_ON</value>
+      <key>ant3</key>
+      <value></value>
     </param>
     <param>
-      <key>fecblocks</key>
-      <value>31</value>
+      <key>bb_gain3</key>
+      <value>20</value>
     </param>
     <param>
-      <key>tiblocks</key>
-      <value>3</value>
+      <key>bw3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>carriermode</key>
-      <value>CARRIERS_NORMAL</value>
+      <key>corr3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fftsize1</key>
-      <value>FFTSIZE_4K</value>
+      <key>freq3</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>fftsize2</key>
-      <value>FFTSIZE_2K</value>
+      <key>if_gain3</key>
+      <value>20</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_32</value>
+      <key>gain3</key>
+      <value>10</value>
     </param>
     <param>
-      <key>l1constellation</key>
-      <value>L1_MOD_16QAM</value>
+      <key>ant4</key>
+      <value></value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP7</value>
+      <key>bb_gain4</key>
+      <value>20</value>
     </param>
     <param>
-      <key>t2frames</key>
-      <value>2</value>
+      <key>bw4</key>
+      <value>0</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>100</value>
+      <key>corr4</key>
+      <value>0</value>
     </param>
     <param>
-      <key>paprmode1</key>
-      <value>PAPR_OFF</value>
+      <key>freq4</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>paprmode2</key>
-      <value>PAPR_OFF</value>
+      <key>if_gain4</key>
+      <value>20</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>gain4</key>
+      <value>10</value>
     </param>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>ant5</key>
+      <value></value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>bb_gain5</key>
+      <value>20</value>
     </param>
     <param>
-      <key>inputmode</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>bw5</key>
+      <value>0</value>
     </param>
     <param>
-      <key>reservedbiasbits</key>
-      <value>RESERVED_OFF</value>
+      <key>corr5</key>
+      <value>0</value>
     </param>
     <param>
-      <key>l1scrambled</key>
-      <value>L1_SCRAMBLED_OFF</value>
+      <key>freq5</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>inband</key>
-      <value>INBAND_OFF</value>
+      <key>if_gain5</key>
+      <value>20</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>gain5</key>
+      <value>10</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>ant6</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>bb_gain6</key>
+      <value>20</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>bw6</key>
       <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(712, 147)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
+      <key>corr6</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_freqinterleaver_cc</key>
-    <param>
-      <key>id</key>
-      <value>dtv_dvbt2_freqinterleaver_cc_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>carriermode</key>
-      <value>CARRIERS_NORMAL</value>
-    </param>
     <param>
-      <key>fftsize</key>
-      <value>FFTSIZE_4K</value>
+      <key>freq6</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP7</value>
+      <key>if_gain6</key>
+      <value>20</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_32</value>
+      <key>gain6</key>
+      <value>10</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>100</value>
+      <key>ant7</key>
+      <value></value>
     </param>
     <param>
-      <key>paprmode1</key>
-      <value>PAPR_OFF</value>
+      <key>bb_gain7</key>
+      <value>20</value>
     </param>
     <param>
-      <key>paprmode2</key>
-      <value>PAPR_OFF</value>
+      <key>bw7</key>
+      <value>0</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>corr7</key>
+      <value>0</value>
     </param>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>freq7</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>if_gain7</key>
+      <value>20</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>gain7</key>
+      <value>10</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>ant8</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>bb_gain8</key>
+      <value>20</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>bw8</key>
       <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(992, 211)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
+      <key>corr8</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_interleaver_bb</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_interleaver_bb_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
-    </param>
-    <param>
-      <key>rate</key>
-      <value>C2_3</value>
+      <key>freq8</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_64QAM</value>
+      <key>if_gain8</key>
+      <value>20</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>gain8</key>
+      <value>10</value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>ant9</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>bb_gain9</key>
+      <value>20</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>bw9</key>
       <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(48, 203)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
+      <key>corr9</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_modulator_bc</key>
-    <param>
-      <key>id</key>
-      <value>dtv_dvbt2_modulator_bc_0</value>
-    </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>freq9</key>
+      <value>100e6</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_64QAM</value>
+      <key>if_gain9</key>
+      <value>20</value>
     </param>
     <param>
-      <key>rotation</key>
-      <value>ROTATION_ON</value>
+      <key>gain9</key>
+      <value>10</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -1954,165 +2076,155 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>args</key>
+      <value>bladerf=0,buffers=128,buflen=32768</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(264, 203)</value>
+      <value>(1048, 428)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_cellinterleaver_cc</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt2_cellinterleaver_cc_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <value>osmosdr_sink_0</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>type</key>
+      <value>fc32</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_64QAM</value>
+      <key>clock_source0</key>
+      <value></value>
     </param>
     <param>
-      <key>fecblocks</key>
-      <value>31</value>
+      <key>time_source0</key>
+      <value></value>
     </param>
     <param>
-      <key>tiblocks</key>
-      <value>3</value>
+      <key>clock_source1</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>time_source1</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>clock_source2</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>time_source2</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>clock_source3</key>
+      <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(488, 195)</value>
+      <key>time_source3</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>clock_source4</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>blocks_file_sink</key>
     <param>
-      <key>id</key>
-      <value>blocks_file_sink_0</value>
+      <key>time_source4</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>False</value>
+      <key>clock_source5</key>
+      <value></value>
     </param>
     <param>
-      <key>file</key>
-      <value>vv.cfile</value>
+      <key>time_source5</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>clock_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>time_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>unbuffered</key>
-      <value>False</value>
+      <key>clock_source7</key>
+      <value></value>
     </param>
     <param>
-      <key>append</key>
-      <value>False</value>
+      <key>time_source7</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>nchan</key>
+      <value>1</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>num_mboards</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(832, 459)</value>
+      <key>sample_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>sync</key>
+      <value></value>
     </param>
   </block>
   <connection>
-    <source_block_id>dtv_dvb_bch_bb_0</source_block_id>
-    <sink_block_id>dtv_dvb_ldpc_bb_0</sink_block_id>
+    <source_block_id>blocks_file_source_0</source_block_id>
+    <sink_block_id>dtv_dvb_bbheader_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvb_bbscrambler_bb_0</source_block_id>
-    <sink_block_id>dtv_dvb_bch_bb_0</sink_block_id>
+    <source_block_id>blocks_multiply_const_xx_0</source_block_id>
+    <sink_block_id>osmosdr_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvb_ldpc_bb_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_interleaver_bb_0</sink_block_id>
+    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_p1insertion_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_interleaver_bb_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_modulator_bc_0</sink_block_id>
+    <source_block_id>dtv_dvb_bbheader_bb_0</source_block_id>
+    <sink_block_id>dtv_dvb_bbscrambler_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_modulator_bc_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_cellinterleaver_cc_0</sink_block_id>
+    <source_block_id>dtv_dvb_bbscrambler_bb_0</source_block_id>
+    <sink_block_id>dtv_dvb_bch_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_cellinterleaver_cc_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_framemapper_cc_0</sink_block_id>
+    <source_block_id>dtv_dvb_bch_bb_0</source_block_id>
+    <sink_block_id>dtv_dvb_ldpc_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvb_bbheader_bb_0</source_block_id>
-    <sink_block_id>dtv_dvb_bbscrambler_bb_0</sink_block_id>
+    <source_block_id>dtv_dvb_ldpc_bb_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_interleaver_bb_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>dtv_dvb_bbheader_bb_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_cellinterleaver_cc_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_framemapper_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2129,32 +2241,32 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_p1insertion_cc_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_interleaver_bb_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_modulator_bc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_pilotgenerator_cc_0</source_block_id>
-    <sink_block_id>digital_ofdm_cyclic_prefixer_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_modulator_bc_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_cellinterleaver_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>dtv_dvbt2_p1insertion_cc_0</source_block_id>
-    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
+    <sink_block_id>blocks_file_sink_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>osmosdr_sink_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_p1insertion_cc_0</source_block_id>
+    <sink_block_id>blocks_multiply_const_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_p1insertion_cc_0</source_block_id>
-    <sink_block_id>blocks_file_sink_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_pilotgenerator_cc_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>
diff --git a/gr-dtv/examples/vv018-miso.grc b/gr-dtv/examples/vv018-miso.grc
index 2eb011bf3f..880e1fce72 100644
--- a/gr-dtv/examples/vv018-miso.grc
+++ b/gr-dtv/examples/vv018-miso.grc
@@ -1,60 +1,32 @@
-<?xml version='1.0' encoding='ASCII'?>
-<?grc format='1' created='3.7.7'?>
+<?xml version='1.0' encoding='utf-8'?>
+<?grc format='1' created='3.7.11'?>
 <flow_graph>
   <timestamp>Mon Dec 29 01:02:46 2014</timestamp>
   <block>
     <key>options</key>
     <param>
-      <key>id</key>
-      <value>vv018_miso</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value></value>
-    </param>
-    <param>
       <key>author</key>
       <value></value>
     </param>
     <param>
-      <key>description</key>
-      <value></value>
-    </param>
-    <param>
       <key>window_size</key>
       <value>1280, 1024</value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
-    </param>
-    <param>
       <key>category</key>
       <value>Custom</value>
     </param>
     <param>
-      <key>run_options</key>
-      <value>prompt</value>
-    </param>
-    <param>
-      <key>run</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>max_nouts</key>
-      <value>0</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
+      <key>description</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
@@ -64,90 +36,90 @@
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>samp_rate</value>
+      <key>generate_options</key>
+      <value>wx_gui</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>hier_block_src_path</key>
+      <value>.:</value>
     </param>
     <param>
-      <key>value</key>
-      <value>(8000000.0) * 8 / 7</value>
+      <key>id</key>
+      <value>vv018_miso</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>max_nouts</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(8, 75)</value>
+      <key>qt_qss_theme</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>realtime_scheduling</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_bbheader_bb</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvb_bbheader_bb_0</value>
+      <key>run_command</key>
+      <value>{python} -u {filename}</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>run_options</key>
+      <value>prompt</value>
     </param>
     <param>
-      <key>standard</key>
-      <value>STANDARD_DVBT2</value>
+      <key>run</key>
+      <value>True</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>thread_safe_setters</key>
+      <value></value>
     </param>
     <param>
-      <key>rate1</key>
-      <value>C5_6</value>
+      <key>title</key>
+      <value></value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>rate2</key>
-      <value>C1_3</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>rate3</key>
-      <value>C1_4</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>rate4</key>
-      <value>C1_4</value>
+      <key>_coordinate</key>
+      <value>(8, 75)</value>
     </param>
     <param>
-      <key>rolloff</key>
-      <value>RO_0_35</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>mode</key>
-      <value>FECFRAME_SHORT</value>
+      <key>id</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>inband</key>
-      <value>INBAND_OFF</value>
+      <key>value</key>
+      <value>(8000000.0) * 8 / 7</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_file_sink</key>
     <param>
-      <key>fecblocks</key>
-      <value>168</value>
+      <key>append</key>
+      <value>False</value>
     </param>
     <param>
-      <key>tsrate</key>
-      <value>4000000</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -155,58 +127,50 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>False</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>file</key>
+      <value>vvtx1.cfile</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(336, 11)</value>
+      <value>(616, 348)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_bbscrambler_bb</key>
     <param>
       <key>id</key>
-      <value>dtv_dvb_bbscrambler_bb_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>standard</key>
-      <value>STANDARD_DVBT2</value>
+      <value>blocks_file_sink_0</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>rate1</key>
-      <value>C5_6</value>
+      <key>unbuffered</key>
+      <value>False</value>
     </param>
     <param>
-      <key>rate2</key>
-      <value>C1_3</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_file_sink</key>
     <param>
-      <key>rate3</key>
-      <value>C1_4</value>
+      <key>append</key>
+      <value>False</value>
     </param>
     <param>
-      <key>rate4</key>
-      <value>C1_4</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -214,58 +178,46 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>False</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>file</key>
+      <value>vvtx2.cfile</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(632, 27)</value>
+      <value>(616, 548)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_bch_bb</key>
     <param>
       <key>id</key>
-      <value>dtv_dvb_bch_bb_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>standard</key>
-      <value>STANDARD_DVBT2</value>
-    </param>
-    <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <value>blocks_file_sink_0_0</value>
     </param>
     <param>
-      <key>rate1</key>
-      <value>C5_6</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>rate2</key>
-      <value>C1_3</value>
+      <key>unbuffered</key>
+      <value>False</value>
     </param>
     <param>
-      <key>rate3</key>
-      <value>C1_4</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_file_source</key>
     <param>
-      <key>rate4</key>
-      <value>C1_4</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -273,156 +225,156 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>file</key>
+      <value>/run/shm/adv32kmiso.ts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(848, 27)</value>
+      <value>(112, 75)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvb_ldpc_bb</key>
     <param>
       <key>id</key>
-      <value>dtv_dvb_ldpc_bb_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <value>blocks_file_source_0</value>
     </param>
     <param>
-      <key>standard</key>
-      <value>STANDARD_DVBT2</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>rate1</key>
-      <value>C5_6</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>rate2</key>
-      <value>C1_3</value>
+      <key>repeat</key>
+      <value>True</value>
     </param>
     <param>
-      <key>rate3</key>
-      <value>C1_4</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_multiply_const_xx</key>
     <param>
-      <key>rate4</key>
-      <value>C1_4</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_OTHER</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>const</key>
+      <value>0.2</value>
     </param>
     <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1056, 27)</value>
+      <value>(616, 452)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_interleaver_bb</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt2_interleaver_bb_0</value>
+      <value>blocks_multiply_const_xx_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>rate</key>
-      <value>C5_6</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_256QAM</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>blocks_null_sink</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>bus_conns</key>
+      <value>[[0,],]</value>
+    </param>
+    <param>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1056, 115)</value>
+      <value>(816, 416)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_modulator_bc</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt2_modulator_bc_0</value>
+      <value>blocks_null_sink_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_256QAM</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
-      <key>rotation</key>
-      <value>ROTATION_ON</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>cp_len</key>
+      <value>32768/16</value>
+    </param>
+    <param>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -430,50 +382,54 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>input_size</key>
+      <value>32768</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(808, 115)</value>
+      <value>(56, 528)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_cellinterleaver_cc</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt2_cellinterleaver_cc_0</value>
+      <value>digital_ofdm_cyclic_prefixer_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>tagname</key>
+      <value></value>
     </param>
     <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_256QAM</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fecblocks</key>
-      <value>61</value>
+      <key>rolloff</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
-      <key>tiblocks</key>
-      <value>1</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>cp_len</key>
+      <value>32768/16</value>
+    </param>
+    <param>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -481,177 +437,161 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>input_size</key>
+      <value>32768</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(576, 107)</value>
+      <value>(56, 408)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_framemapper_cc</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt2_framemapper_cc_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>framesize</key>
-      <value>FECFRAME_NORMAL</value>
-    </param>
-    <param>
-      <key>rate</key>
-      <value>C5_6</value>
+      <value>digital_ofdm_cyclic_prefixer_0_0</value>
     </param>
     <param>
-      <key>constellation</key>
-      <value>MOD_256QAM</value>
+      <key>tagname</key>
+      <value></value>
     </param>
     <param>
-      <key>rotation</key>
-      <value>ROTATION_ON</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fecblocks</key>
-      <value>61</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>tiblocks</key>
-      <value>1</value>
+      <key>rolloff</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvb_bbheader_bb</key>
     <param>
-      <key>carriermode</key>
-      <value>CARRIERS_EXTENDED</value>
+      <key>mode</key>
+      <value>INPUTMODE_NORMAL</value>
     </param>
     <param>
-      <key>fftsize1</key>
-      <value>FFTSIZE_32K</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>fftsize2</key>
-      <value>FFTSIZE_2K</value>
+      <key>rate1</key>
+      <value>C5_6</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_16</value>
+      <key>rate2</key>
+      <value>C1_3</value>
     </param>
     <param>
-      <key>l1constellation</key>
-      <value>L1_MOD_64QAM</value>
+      <key>rate3</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP2</value>
+      <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
     </param>
     <param>
-      <key>t2frames</key>
-      <value>2</value>
+      <key>rate5</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>19</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>paprmode1</key>
-      <value>PAPR_OFF</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
-      <key>paprmode2</key>
-      <value>PAPR_OFF</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>fecblocks</key>
+      <value>168</value>
     </param>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_MISO</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>inputmode</key>
-      <value>FECFRAME_NORMAL</value>
+      <key>_coordinate</key>
+      <value>(336, 8)</value>
     </param>
     <param>
-      <key>reservedbiasbits</key>
-      <value>RESERVED_OFF</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>l1scrambled</key>
-      <value>L1_SCRAMBLED_OFF</value>
+      <key>id</key>
+      <value>dtv_dvb_bbheader_bb_0</value>
     </param>
     <param>
       <key>inband</key>
       <value>INBAND_OFF</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>rolloff</key>
+      <value>RO_0_35</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(48, 155)</value>
+      <key>standard</key>
+      <value>STANDARD_DVBT2</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>tsrate</key>
+      <value>4000000</value>
     </param>
   </block>
   <block>
-    <key>digital_ofdm_cyclic_prefixer</key>
+    <key>dtv_dvb_bbscrambler_bb</key>
     <param>
-      <key>id</key>
-      <value>digital_ofdm_cyclic_prefixer_0_0</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>rate1</key>
+      <value>C5_6</value>
     </param>
     <param>
-      <key>input_size</key>
-      <value>32768</value>
+      <key>rate2</key>
+      <value>C1_3</value>
     </param>
     <param>
-      <key>cp_len</key>
-      <value>32768/16</value>
+      <key>rate3</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>rolloff</key>
-      <value>0</value>
+      <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
     </param>
     <param>
-      <key>tagname</key>
-      <value></value>
+      <key>rate5</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -659,74 +599,70 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
+    </param>
+    <param>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(56, 451)</value>
+      <value>(608, 20)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_freqinterleaver_cc</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt2_freqinterleaver_cc_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>carriermode</key>
-      <value>CARRIERS_EXTENDED</value>
+      <value>dtv_dvb_bbscrambler_bb_0</value>
     </param>
     <param>
-      <key>fftsize</key>
-      <value>FFTSIZE_32K</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP2</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_16</value>
+      <key>standard</key>
+      <value>STANDARD_DVBT2</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvb_bch_bb</key>
     <param>
-      <key>numdatasyms</key>
-      <value>19</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>paprmode1</key>
-      <value>PAPR_OFF</value>
+      <key>rate1</key>
+      <value>C5_6</value>
     </param>
     <param>
-      <key>paprmode2</key>
-      <value>PAPR_OFF</value>
+      <key>rate2</key>
+      <value>C1_3</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>rate3</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_MISO</value>
+      <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>rate5</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -734,267 +670,261 @@
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
+    </param>
+    <param>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(328, 195)</value>
+      <value>(824, 20)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_p1insertion_cc</key>
     <param>
       <key>id</key>
-      <value>dtv_dvbt2_p1insertion_cc_0</value>
+      <value>dtv_dvb_bch_bb_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>carriermode</key>
-      <value>CARRIERS_EXTENDED</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fftsize1</key>
-      <value>FFTSIZE_32K</value>
+      <key>standard</key>
+      <value>STANDARD_DVBT2</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvb_ldpc_bb</key>
     <param>
-      <key>fftsize2</key>
-      <value>FFTSIZE_2K</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_16</value>
+      <key>rate1</key>
+      <value>C5_6</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>19</value>
+      <key>rate2</key>
+      <value>C1_3</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>rate3</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>preamble1</key>
-      <value>PREAMBLE_T2_MISO</value>
+      <key>rate4</key>
+      <value>C1_5_MEDIUM</value>
     </param>
     <param>
-      <key>preamble2</key>
-      <value>PREAMBLE_T2_SISO</value>
+      <key>rate5</key>
+      <value>C1_4</value>
     </param>
     <param>
-      <key>showlevels</key>
-      <value>SHOWLEVELS_OFF</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>vclip</key>
-      <value>3.3</value>
+      <key>constellation</key>
+      <value>MOD_OTHER</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>framesize1</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize2</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(312, 523)</value>
+      <value>(1056, 20)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>digital_ofdm_cyclic_prefixer</key>
     <param>
       <key>id</key>
-      <value>digital_ofdm_cyclic_prefixer_0</value>
+      <value>dtv_dvb_ldpc_bb_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>input_size</key>
-      <value>32768</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>cp_len</key>
-      <value>32768/16</value>
+      <key>standard</key>
+      <value>STANDARD_DVBT2</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_cellinterleaver_cc</key>
     <param>
-      <key>rolloff</key>
-      <value>0</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>tagname</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>constellation</key>
+      <value>MOD_256QAM</value>
     </param>
     <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>fecblocks</key>
+      <value>61</value>
+    </param>
+    <param>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(56, 579)</value>
+      <value>(576, 104)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_file_sink</key>
     <param>
       <key>id</key>
-      <value>blocks_file_sink_0_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>False</value>
+      <value>dtv_dvbt2_cellinterleaver_cc_0</value>
     </param>
     <param>
-      <key>file</key>
-      <value>vvtx2.cfile</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>tiblocks</key>
       <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_framemapper_cc</key>
     <param>
-      <key>unbuffered</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>append</key>
-      <value>False</value>
+      <key>inputmode</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>rate</key>
+      <value>C5_6</value>
+    </param>
+    <param>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(616, 579)</value>
+      <key>rotation</key>
+      <value>ROTATION_ON</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>constellation</key>
+      <value>MOD_256QAM</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_multiply_const_vxx</key>
     <param>
-      <key>id</key>
-      <value>blocks_multiply_const_vxx_0</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>const</key>
-      <value>0.2</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>carriermode</key>
+      <value>CARRIERS_EXTENDED</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>fecblocks</key>
+      <value>61</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>fftsize1</key>
+      <value>FFTSIZE_32K</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>fftsize2</key>
+      <value>FFTSIZE_2K</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(616, 499)</value>
+      <value>(48, 148)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_pilotgenerator_cc</key>
+    <param>
+      <key>guardinterval</key>
+      <value>GI_1_16</value>
+    </param>
     <param>
       <key>id</key>
-      <value>dtv_dvbt2_pilotgenerator_cc_0</value>
+      <value>dtv_dvbt2_framemapper_cc_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>inband</key>
+      <value>INBAND_OFF</value>
     </param>
     <param>
-      <key>carriermode</key>
-      <value>CARRIERS_EXTENDED</value>
+      <key>l1constellation</key>
+      <value>L1_MOD_64QAM</value>
     </param>
     <param>
-      <key>fftsize</key>
-      <value>FFTSIZE_32K</value>
+      <key>l1scrambled</key>
+      <value>L1_SCRAMBLED_OFF</value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP2</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>guardinterval</key>
-      <value>GI_1_16</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>numdatasyms</key>
@@ -1009,8 +939,8 @@
       <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>pilotpattern</key>
+      <value>PILOT_PP2</value>
     </param>
     <param>
       <key>preamble1</key>
@@ -1021,47 +951,35 @@
       <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>misogroup</key>
-      <value>MISO_TX2</value>
+      <key>reservedbiasbits</key>
+      <value>RESERVED_OFF</value>
     </param>
     <param>
-      <key>equalization</key>
-      <value>EQUALIZATION_ON</value>
+      <key>version</key>
+      <value>VERSION_111</value>
     </param>
     <param>
-      <key>bandwidth</key>
-      <value>BANDWIDTH_8_0_MHZ</value>
+      <key>t2frames</key>
+      <value>2</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>tiblocks</key>
+      <value>1</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_freqinterleaver_cc</key>
     <param>
-      <key>affinity</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(1016, 411)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>comment</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>dtv_dvbt2_pilotgenerator_cc</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_pilotgenerator_cc_1</value>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1076,14 +994,30 @@
       <value>FFTSIZE_32K</value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP2</value>
+      <key>_coordinate</key>
+      <value>(344, 204)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
       <key>guardinterval</key>
       <value>GI_1_16</value>
     </param>
     <param>
+      <key>id</key>
+      <value>dtv_dvbt2_freqinterleaver_cc_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>numdatasyms</key>
       <value>19</value>
     </param>
@@ -1096,8 +1030,8 @@
       <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>pilotpattern</key>
+      <value>PILOT_PP2</value>
     </param>
     <param>
       <key>preamble1</key>
@@ -1108,47 +1042,74 @@
       <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>misogroup</key>
-      <value>MISO_TX1</value>
+      <key>version</key>
+      <value>VERSION_111</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_interleaver_bb</key>
     <param>
-      <key>equalization</key>
-      <value>EQUALIZATION_ON</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>bandwidth</key>
-      <value>BANDWIDTH_8_0_MHZ</value>
+      <key>rate</key>
+      <value>C5_6</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>constellation</key>
+      <value>MOD_256QAM</value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1016, 203)</value>
+      <value>(1056, 108)</value>
     </param>
     <param>
       <key>_rotation</key>
+      <value>180</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>dtv_dvbt2_interleaver_bb_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
   </block>
   <block>
     <key>dtv_dvbt2_miso_cc</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_miso_cc_0</value>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1163,14 +1124,30 @@
       <value>FFTSIZE_32K</value>
     </param>
     <param>
-      <key>pilotpattern</key>
-      <value>PILOT_PP2</value>
+      <key>_coordinate</key>
+      <value>(640, 208)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
       <key>guardinterval</key>
       <value>GI_1_16</value>
     </param>
     <param>
+      <key>id</key>
+      <value>dtv_dvbt2_miso_cc_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>numdatasyms</key>
       <value>19</value>
     </param>
@@ -1183,39 +1160,78 @@
       <value>PAPR_OFF</value>
     </param>
     <param>
+      <key>pilotpattern</key>
+      <value>PILOT_PP2</value>
+    </param>
+    <param>
       <key>version</key>
       <value>VERSION_111</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_modulator_bc</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>rotation</key>
+      <value>ROTATION_ON</value>
+    </param>
+    <param>
+      <key>constellation</key>
+      <value>MOD_256QAM</value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>framesize</key>
+      <value>FECFRAME_NORMAL</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(640, 203)</value>
+      <value>(808, 108)</value>
     </param>
     <param>
       <key>_rotation</key>
+      <value>180</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>dtv_dvbt2_modulator_bc_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
   </block>
   <block>
     <key>dtv_dvbt2_p1insertion_cc</key>
     <param>
-      <key>id</key>
-      <value>dtv_dvbt2_p1insertion_cc_0_0</value>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1234,16 +1250,32 @@
       <value>FFTSIZE_2K</value>
     </param>
     <param>
+      <key>_coordinate</key>
+      <value>(312, 504)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>guardinterval</key>
       <value>GI_1_16</value>
     </param>
     <param>
-      <key>numdatasyms</key>
-      <value>19</value>
+      <key>id</key>
+      <value>dtv_dvbt2_p1insertion_cc_0</value>
     </param>
     <param>
-      <key>version</key>
-      <value>VERSION_111</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>numdatasyms</key>
+      <value>19</value>
     </param>
     <param>
       <key>preamble1</key>
@@ -1258,1077 +1290,1179 @@
       <value>SHOWLEVELS_OFF</value>
     </param>
     <param>
+      <key>version</key>
+      <value>VERSION_111</value>
+    </param>
+    <param>
       <key>vclip</key>
       <value>3.3</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_p1insertion_cc</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>carriermode</key>
+      <value>CARRIERS_EXTENDED</value>
+    </param>
+    <param>
+      <key>fftsize1</key>
+      <value>FFTSIZE_32K</value>
+    </param>
+    <param>
+      <key>fftsize2</key>
+      <value>FFTSIZE_2K</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(312, 379)</value>
+      <value>(312, 368)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_file_sink</key>
+    <param>
+      <key>guardinterval</key>
+      <value>GI_1_16</value>
+    </param>
     <param>
       <key>id</key>
-      <value>blocks_file_sink_0</value>
+      <value>dtv_dvbt2_p1insertion_cc_0_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>False</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>file</key>
-      <value>vvtx1.cfile</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>numdatasyms</key>
+      <value>19</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_MISO</value>
     </param>
     <param>
-      <key>unbuffered</key>
-      <value>False</value>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>append</key>
-      <value>False</value>
+      <key>showlevels</key>
+      <value>SHOWLEVELS_OFF</value>
+    </param>
+    <param>
+      <key>version</key>
+      <value>VERSION_111</value>
+    </param>
+    <param>
+      <key>vclip</key>
+      <value>3.3</value>
+    </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_pilotgenerator_cc</key>
+    <param>
+      <key>bandwidth</key>
+      <value>BANDWIDTH_8_0_MHZ</value>
     </param>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>carriermode</key>
+      <value>CARRIERS_EXTENDED</value>
+    </param>
+    <param>
+      <key>fftsize</key>
+      <value>FFTSIZE_32K</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(616, 411)</value>
+      <value>(1016, 380)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>osmosdr_sink</key>
+    <param>
+      <key>guardinterval</key>
+      <value>GI_1_16</value>
+    </param>
     <param>
       <key>id</key>
-      <value>osmosdr_sink_0</value>
+      <value>dtv_dvbt2_pilotgenerator_cc_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>misogroup</key>
+      <value>MISO_TX2</value>
     </param>
     <param>
-      <key>type</key>
-      <value>fc32</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>args</key>
-      <value>bladerf=0,buffers=128,buflen=32768</value>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>sync</key>
-      <value></value>
+      <key>numdatasyms</key>
+      <value>19</value>
     </param>
     <param>
-      <key>num_mboards</key>
-      <value>1</value>
+      <key>paprmode1</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>clock_source0</key>
-      <value></value>
+      <key>paprmode2</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>time_source0</key>
-      <value></value>
+      <key>pilotpattern</key>
+      <value>PILOT_PP2</value>
     </param>
     <param>
-      <key>clock_source1</key>
-      <value></value>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_MISO</value>
     </param>
     <param>
-      <key>time_source1</key>
-      <value></value>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
     </param>
     <param>
-      <key>clock_source2</key>
-      <value></value>
+      <key>equalization</key>
+      <value>EQUALIZATION_ON</value>
     </param>
     <param>
-      <key>time_source2</key>
-      <value></value>
+      <key>version</key>
+      <value>VERSION_111</value>
     </param>
+  </block>
+  <block>
+    <key>dtv_dvbt2_pilotgenerator_cc</key>
     <param>
-      <key>clock_source3</key>
-      <value></value>
+      <key>bandwidth</key>
+      <value>BANDWIDTH_8_0_MHZ</value>
     </param>
     <param>
-      <key>time_source3</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>clock_source4</key>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>time_source4</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>clock_source5</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>time_source5</key>
-      <value></value>
+      <key>carriermode</key>
+      <value>CARRIERS_EXTENDED</value>
     </param>
     <param>
-      <key>clock_source6</key>
-      <value></value>
+      <key>fftsize</key>
+      <value>FFTSIZE_32K</value>
     </param>
     <param>
-      <key>time_source6</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(1016, 188)</value>
     </param>
     <param>
-      <key>clock_source7</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
     <param>
-      <key>time_source7</key>
-      <value></value>
+      <key>guardinterval</key>
+      <value>GI_1_16</value>
     </param>
     <param>
-      <key>nchan</key>
-      <value>1</value>
+      <key>id</key>
+      <value>dtv_dvbt2_pilotgenerator_cc_1</value>
     </param>
     <param>
-      <key>sample_rate</key>
-      <value>samp_rate</value>
+      <key>misogroup</key>
+      <value>MISO_TX1</value>
     </param>
     <param>
-      <key>freq0</key>
-      <value>429e6</value>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
-      <key>corr0</key>
+      <key>minoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain0</key>
-      <value>18</value>
+      <key>numdatasyms</key>
+      <value>19</value>
     </param>
     <param>
-      <key>if_gain0</key>
-      <value>0</value>
+      <key>paprmode1</key>
+      <value>PAPR_OFF</value>
     </param>
     <param>
-      <key>bb_gain0</key>
-      <value>-8</value>
+      <key>paprmode2</key>
+      <value>PAPR_OFF</value>
+    </param>
+    <param>
+      <key>pilotpattern</key>
+      <value>PILOT_PP2</value>
+    </param>
+    <param>
+      <key>preamble1</key>
+      <value>PREAMBLE_T2_MISO</value>
+    </param>
+    <param>
+      <key>preamble2</key>
+      <value>PREAMBLE_T2_SISO</value>
+    </param>
+    <param>
+      <key>equalization</key>
+      <value>EQUALIZATION_ON</value>
+    </param>
+    <param>
+      <key>version</key>
+      <value>VERSION_111</value>
+    </param>
+  </block>
+  <block>
+    <key>osmosdr_sink</key>
+    <param>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>ant0</key>
       <value></value>
     </param>
     <param>
+      <key>bb_gain0</key>
+      <value>-8</value>
+    </param>
+    <param>
       <key>bw0</key>
       <value>8750000</value>
     </param>
     <param>
-      <key>freq1</key>
-      <value>100e6</value>
+      <key>corr0</key>
+      <value>0</value>
     </param>
     <param>
-      <key>corr1</key>
+      <key>freq0</key>
+      <value>429e6</value>
+    </param>
+    <param>
+      <key>if_gain0</key>
       <value>0</value>
     </param>
     <param>
-      <key>gain1</key>
-      <value>10</value>
+      <key>gain0</key>
+      <value>18</value>
     </param>
     <param>
-      <key>if_gain1</key>
-      <value>20</value>
+      <key>ant10</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain1</key>
+      <key>bb_gain10</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant1</key>
-      <value></value>
+      <key>bw10</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw1</key>
+      <key>corr10</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq2</key>
+      <key>freq10</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr2</key>
-      <value>0</value>
+      <key>if_gain10</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain2</key>
+      <key>gain10</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain2</key>
-      <value>20</value>
+      <key>ant11</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain2</key>
+      <key>bb_gain11</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant2</key>
-      <value></value>
+      <key>bw11</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw2</key>
+      <key>corr11</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq3</key>
+      <key>freq11</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr3</key>
-      <value>0</value>
+      <key>if_gain11</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain3</key>
+      <key>gain11</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain3</key>
-      <value>20</value>
+      <key>ant12</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain3</key>
+      <key>bb_gain12</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant3</key>
-      <value></value>
+      <key>bw12</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw3</key>
+      <key>corr12</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq4</key>
+      <key>freq12</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr4</key>
-      <value>0</value>
+      <key>if_gain12</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain4</key>
+      <key>gain12</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain4</key>
-      <value>20</value>
+      <key>ant13</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain4</key>
+      <key>bb_gain13</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant4</key>
-      <value></value>
+      <key>bw13</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw4</key>
+      <key>corr13</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq5</key>
+      <key>freq13</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr5</key>
-      <value>0</value>
+      <key>if_gain13</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain5</key>
+      <key>gain13</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain5</key>
-      <value>20</value>
+      <key>ant14</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain5</key>
+      <key>bb_gain14</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant5</key>
-      <value></value>
+      <key>bw14</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw5</key>
+      <key>corr14</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq6</key>
+      <key>freq14</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr6</key>
-      <value>0</value>
+      <key>if_gain14</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain6</key>
+      <key>gain14</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain6</key>
-      <value>20</value>
+      <key>ant15</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain6</key>
+      <key>bb_gain15</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant6</key>
-      <value></value>
+      <key>bw15</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw6</key>
+      <key>corr15</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq7</key>
+      <key>freq15</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr7</key>
-      <value>0</value>
+      <key>if_gain15</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain7</key>
+      <key>gain15</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain7</key>
-      <value>20</value>
+      <key>ant16</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain7</key>
+      <key>bb_gain16</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant7</key>
-      <value></value>
+      <key>bw16</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw7</key>
+      <key>corr16</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq8</key>
+      <key>freq16</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr8</key>
-      <value>0</value>
+      <key>if_gain16</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain8</key>
+      <key>gain16</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain8</key>
-      <value>20</value>
+      <key>ant17</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain8</key>
+      <key>bb_gain17</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant8</key>
-      <value></value>
+      <key>bw17</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw8</key>
+      <key>corr17</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq9</key>
+      <key>freq17</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr9</key>
-      <value>0</value>
+      <key>if_gain17</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain9</key>
+      <key>gain17</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain9</key>
-      <value>20</value>
+      <key>ant18</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain9</key>
+      <key>bb_gain18</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant9</key>
-      <value></value>
+      <key>bw18</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw9</key>
+      <key>corr18</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq10</key>
+      <key>freq18</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr10</key>
-      <value>0</value>
+      <key>if_gain18</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain10</key>
+      <key>gain18</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain10</key>
-      <value>20</value>
+      <key>ant19</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain10</key>
+      <key>bb_gain19</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant10</key>
-      <value></value>
+      <key>bw19</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw10</key>
+      <key>corr19</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq11</key>
+      <key>freq19</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr11</key>
-      <value>0</value>
+      <key>if_gain19</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain11</key>
+      <key>gain19</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain11</key>
-      <value>20</value>
+      <key>ant1</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain11</key>
+      <key>bb_gain1</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant11</key>
-      <value></value>
+      <key>bw1</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw11</key>
+      <key>corr1</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq12</key>
+      <key>freq1</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr12</key>
-      <value>0</value>
+      <key>if_gain1</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain12</key>
+      <key>gain1</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain12</key>
-      <value>20</value>
+      <key>ant20</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain12</key>
+      <key>bb_gain20</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant12</key>
-      <value></value>
+      <key>bw20</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw12</key>
+      <key>corr20</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq13</key>
+      <key>freq20</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr13</key>
-      <value>0</value>
+      <key>if_gain20</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain13</key>
+      <key>gain20</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain13</key>
-      <value>20</value>
+      <key>ant21</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain13</key>
+      <key>bb_gain21</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant13</key>
-      <value></value>
+      <key>bw21</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw13</key>
+      <key>corr21</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq14</key>
+      <key>freq21</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr14</key>
-      <value>0</value>
+      <key>if_gain21</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain14</key>
+      <key>gain21</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain14</key>
-      <value>20</value>
+      <key>ant22</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain14</key>
+      <key>bb_gain22</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant14</key>
-      <value></value>
+      <key>bw22</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw14</key>
+      <key>corr22</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq15</key>
+      <key>freq22</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr15</key>
-      <value>0</value>
+      <key>if_gain22</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain15</key>
+      <key>gain22</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain15</key>
-      <value>20</value>
+      <key>ant23</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain15</key>
+      <key>bb_gain23</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant15</key>
-      <value></value>
+      <key>bw23</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw15</key>
+      <key>corr23</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq16</key>
+      <key>freq23</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr16</key>
-      <value>0</value>
+      <key>if_gain23</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain16</key>
+      <key>gain23</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain16</key>
-      <value>20</value>
+      <key>ant24</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain16</key>
+      <key>bb_gain24</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant16</key>
-      <value></value>
+      <key>bw24</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw16</key>
+      <key>corr24</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq17</key>
+      <key>freq24</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr17</key>
-      <value>0</value>
+      <key>if_gain24</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain17</key>
+      <key>gain24</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain17</key>
-      <value>20</value>
+      <key>ant25</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain17</key>
+      <key>bb_gain25</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant17</key>
-      <value></value>
+      <key>bw25</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw17</key>
+      <key>corr25</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq18</key>
+      <key>freq25</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr18</key>
-      <value>0</value>
+      <key>if_gain25</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain18</key>
+      <key>gain25</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain18</key>
-      <value>20</value>
+      <key>ant26</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain18</key>
+      <key>bb_gain26</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant18</key>
-      <value></value>
+      <key>bw26</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw18</key>
+      <key>corr26</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq19</key>
+      <key>freq26</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr19</key>
-      <value>0</value>
+      <key>if_gain26</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain19</key>
+      <key>gain26</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain19</key>
-      <value>20</value>
+      <key>ant27</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain19</key>
+      <key>bb_gain27</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant19</key>
-      <value></value>
+      <key>bw27</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw19</key>
+      <key>corr27</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq20</key>
+      <key>freq27</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr20</key>
-      <value>0</value>
+      <key>if_gain27</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain20</key>
+      <key>gain27</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain20</key>
-      <value>20</value>
+      <key>ant28</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain20</key>
+      <key>bb_gain28</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant20</key>
-      <value></value>
+      <key>bw28</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw20</key>
+      <key>corr28</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq21</key>
+      <key>freq28</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr21</key>
-      <value>0</value>
+      <key>if_gain28</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain21</key>
+      <key>gain28</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain21</key>
-      <value>20</value>
+      <key>ant29</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain21</key>
+      <key>bb_gain29</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant21</key>
-      <value></value>
+      <key>bw29</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw21</key>
+      <key>corr29</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq22</key>
+      <key>freq29</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr22</key>
-      <value>0</value>
+      <key>if_gain29</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain22</key>
+      <key>gain29</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain22</key>
-      <value>20</value>
+      <key>ant2</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain22</key>
+      <key>bb_gain2</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant22</key>
-      <value></value>
+      <key>bw2</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw22</key>
+      <key>corr2</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq23</key>
+      <key>freq2</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr23</key>
-      <value>0</value>
+      <key>if_gain2</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain23</key>
+      <key>gain2</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain23</key>
-      <value>20</value>
+      <key>ant30</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain23</key>
+      <key>bb_gain30</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant23</key>
-      <value></value>
+      <key>bw30</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw23</key>
+      <key>corr30</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq24</key>
+      <key>freq30</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr24</key>
-      <value>0</value>
+      <key>if_gain30</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain24</key>
+      <key>gain30</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain24</key>
-      <value>20</value>
+      <key>ant31</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain24</key>
+      <key>bb_gain31</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant24</key>
-      <value></value>
+      <key>bw31</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw24</key>
+      <key>corr31</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq25</key>
+      <key>freq31</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr25</key>
-      <value>0</value>
+      <key>if_gain31</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain25</key>
+      <key>gain31</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain25</key>
-      <value>20</value>
+      <key>ant3</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain25</key>
+      <key>bb_gain3</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant25</key>
-      <value></value>
+      <key>bw3</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw25</key>
+      <key>corr3</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq26</key>
+      <key>freq3</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr26</key>
-      <value>0</value>
+      <key>if_gain3</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain26</key>
+      <key>gain3</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain26</key>
-      <value>20</value>
+      <key>ant4</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain26</key>
+      <key>bb_gain4</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant26</key>
-      <value></value>
+      <key>bw4</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw26</key>
+      <key>corr4</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq27</key>
+      <key>freq4</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr27</key>
-      <value>0</value>
+      <key>if_gain4</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain27</key>
+      <key>gain4</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain27</key>
-      <value>20</value>
+      <key>ant5</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain27</key>
+      <key>bb_gain5</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant27</key>
-      <value></value>
+      <key>bw5</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw27</key>
+      <key>corr5</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq28</key>
+      <key>freq5</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr28</key>
-      <value>0</value>
+      <key>if_gain5</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain28</key>
+      <key>gain5</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain28</key>
-      <value>20</value>
+      <key>ant6</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain28</key>
+      <key>bb_gain6</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant28</key>
-      <value></value>
+      <key>bw6</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw28</key>
+      <key>corr6</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq29</key>
+      <key>freq6</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr29</key>
-      <value>0</value>
+      <key>if_gain6</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain29</key>
+      <key>gain6</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain29</key>
-      <value>20</value>
+      <key>ant7</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain29</key>
+      <key>bb_gain7</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant29</key>
-      <value></value>
+      <key>bw7</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw29</key>
+      <key>corr7</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq30</key>
+      <key>freq7</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr30</key>
-      <value>0</value>
+      <key>if_gain7</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain30</key>
+      <key>gain7</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain30</key>
-      <value>20</value>
+      <key>ant8</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain30</key>
+      <key>bb_gain8</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant30</key>
-      <value></value>
+      <key>bw8</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw30</key>
+      <key>corr8</key>
       <value>0</value>
     </param>
     <param>
-      <key>freq31</key>
+      <key>freq8</key>
       <value>100e6</value>
     </param>
     <param>
-      <key>corr31</key>
-      <value>0</value>
+      <key>if_gain8</key>
+      <value>20</value>
     </param>
     <param>
-      <key>gain31</key>
+      <key>gain8</key>
       <value>10</value>
     </param>
     <param>
-      <key>if_gain31</key>
-      <value>20</value>
+      <key>ant9</key>
+      <value></value>
     </param>
     <param>
-      <key>bb_gain31</key>
+      <key>bb_gain9</key>
       <value>20</value>
     </param>
     <param>
-      <key>ant31</key>
-      <value></value>
+      <key>bw9</key>
+      <value>0</value>
     </param>
     <param>
-      <key>bw31</key>
+      <key>corr9</key>
       <value>0</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>freq9</key>
+      <value>100e6</value>
+    </param>
+    <param>
+      <key>if_gain9</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>gain9</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>comment</key>
       <value></value>
     </param>
     <param>
@@ -2336,141 +2470,131 @@
       <value></value>
     </param>
     <param>
+      <key>args</key>
+      <value>bladerf=0,buffers=128,buflen=32768</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(792, 443)</value>
+      <value>(816, 484)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_file_source</key>
     <param>
       <key>id</key>
-      <value>blocks_file_source_0</value>
+      <value>osmosdr_sink_0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>type</key>
+      <value>fc32</value>
     </param>
     <param>
-      <key>file</key>
-      <value>/run/shm/adv32kmiso.ts</value>
+      <key>clock_source0</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
+      <key>time_source0</key>
+      <value></value>
     </param>
     <param>
-      <key>repeat</key>
-      <value>True</value>
+      <key>clock_source1</key>
+      <value></value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>time_source1</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <key>clock_source2</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>time_source2</key>
       <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>clock_source3</key>
+      <value></value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>time_source3</key>
+      <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(112, 75)</value>
+      <key>clock_source4</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>time_source4</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>blocks_null_sink</key>
     <param>
-      <key>id</key>
-      <value>blocks_null_sink_0</value>
+      <key>clock_source5</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>time_source5</key>
+      <value></value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>clock_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>time_source6</key>
+      <value></value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>clock_source7</key>
+      <value></value>
     </param>
     <param>
-      <key>bus_conns</key>
-      <value>[[0,],]</value>
+      <key>time_source7</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>nchan</key>
+      <value>1</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>num_mboards</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(616, 352)</value>
+      <key>sample_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>sync</key>
+      <value></value>
     </param>
   </block>
   <connection>
-    <source_block_id>dtv_dvb_bch_bb_0</source_block_id>
-    <sink_block_id>dtv_dvb_ldpc_bb_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>dtv_dvb_bbscrambler_bb_0</source_block_id>
-    <sink_block_id>dtv_dvb_bch_bb_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>dtv_dvb_ldpc_bb_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_interleaver_bb_0</sink_block_id>
+    <source_block_id>blocks_file_source_0</source_block_id>
+    <sink_block_id>dtv_dvb_bbheader_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_interleaver_bb_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_modulator_bc_0</sink_block_id>
+    <source_block_id>blocks_multiply_const_xx_0</source_block_id>
+    <sink_block_id>osmosdr_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_modulator_bc_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_cellinterleaver_cc_0</sink_block_id>
+    <source_block_id>digital_ofdm_cyclic_prefixer_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_p1insertion_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_cellinterleaver_cc_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_framemapper_cc_0</sink_block_id>
+    <source_block_id>digital_ofdm_cyclic_prefixer_0_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_p1insertion_cc_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2481,50 +2605,44 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_file_source_0</source_block_id>
-    <sink_block_id>dtv_dvb_bbheader_bb_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>dtv_dvbt2_framemapper_cc_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_freqinterleaver_cc_0</sink_block_id>
+    <source_block_id>dtv_dvb_bbscrambler_bb_0</source_block_id>
+    <sink_block_id>dtv_dvb_bch_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>dtv_dvbt2_p1insertion_cc_0</sink_block_id>
+    <source_block_id>dtv_dvb_bch_bb_0</source_block_id>
+    <sink_block_id>dtv_dvb_ldpc_bb_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_pilotgenerator_cc_1</source_block_id>
-    <sink_block_id>digital_ofdm_cyclic_prefixer_0_0</sink_block_id>
+    <source_block_id>dtv_dvb_ldpc_bb_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_interleaver_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_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_p1insertion_cc_0_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_cellinterleaver_cc_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_framemapper_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_p1insertion_cc_0_0</source_block_id>
-    <sink_block_id>blocks_file_sink_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_framemapper_cc_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_freqinterleaver_cc_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>osmosdr_sink_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_freqinterleaver_cc_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_miso_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_freqinterleaver_cc_0</source_block_id>
-    <sink_block_id>dtv_dvbt2_miso_cc_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_interleaver_bb_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_modulator_bc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2541,8 +2659,8 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt2_p1insertion_cc_0_0</source_block_id>
-    <sink_block_id>blocks_null_sink_0</sink_block_id>
+    <source_block_id>dtv_dvbt2_modulator_bc_0</source_block_id>
+    <sink_block_id>dtv_dvbt2_cellinterleaver_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2554,7 +2672,19 @@
   </connection>
   <connection>
     <source_block_id>dtv_dvbt2_p1insertion_cc_0</source_block_id>
-    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
+    <sink_block_id>blocks_multiply_const_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>dtv_dvbt2_p1insertion_cc_0_0</source_block_id>
+    <sink_block_id>blocks_file_sink_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>dtv_dvbt2_p1insertion_cc_0_0</source_block_id>
+    <sink_block_id>blocks_null_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2564,4 +2694,10 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>dtv_dvbt2_pilotgenerator_cc_1</source_block_id>
+    <sink_block_id>digital_ofdm_cyclic_prefixer_0_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
 </flow_graph>
diff --git a/gr-dtv/lib/atsc/atsc_interleaver_impl.cc b/gr-dtv/lib/atsc/atsc_interleaver_impl.cc
index e628fbf30d..cfc9e2996c 100644
--- a/gr-dtv/lib/atsc/atsc_interleaver_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_interleaver_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include "atsc_interleaver_impl.h"
 #include "gnuradio/dtv/atsc_consts.h"
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -45,14 +44,15 @@ namespace gr {
       J = 4;
       registers = (unsigned char *) malloc(sizeof(unsigned char) * I * ((I - 1) * J));
       if (registers == NULL) {
-        fprintf(stderr, "Out of memory.\n");
-        exit(1);
+        GR_LOG_FATAL(d_logger, "ATSC Interleaver, cannot allocate memory for registers.");
+        throw std::bad_alloc();
       }
 
       pointers = (int *) malloc(sizeof(int) * I);
       if (pointers == NULL) {
-        fprintf(stderr, "Out of memory.\n");
-        exit(1);
+        free(registers);
+        GR_LOG_FATAL(d_logger, "ATSC Interleaver, cannot allocate memory for pointers");
+        throw std::bad_alloc();
       }
 
       memset(registers, 0, sizeof(unsigned char) * I * ((I - 1) * J));
diff --git a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
index 6961c2265c..d14b46a0e1 100644
--- a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
+++ b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvb_bbheader_bb_impl.h"
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -504,7 +503,7 @@ namespace gr {
             for (int j = 0; j < (int)((kbch - 80 - padding) / 8); j++) {
               if (count == 0) {
                 if (*in != 0x47) {
-                  printf("Transport Stream sync error!\n");
+                  GR_LOG_WARN(d_logger, "Transport Stream sync error!");
                 }
                 j--;
                 in++;
@@ -527,7 +526,7 @@ namespace gr {
             for (int j = 0; j < (int)((kbch - 80 - padding) / 8); j++) {
               if (count == 0) {
                 if (*in != 0x47) {
-                  printf("Transport Stream sync error!\n");
+                  GR_LOG_WARN(d_logger, "Transport Stream sync error!");
                 }
                 in++;
                 b = crc;
@@ -560,7 +559,7 @@ namespace gr {
             if (nibble == TRUE) {
               if (count == 0) {
                 if (*in != 0x47) {
-                  printf("Transport Stream sync error!\n");
+                  GR_LOG_WARN(d_logger, "Transport Stream sync error!");
                 }
                 in++;
                 b = crc;
diff --git a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
index d6c338695a..688ad7a40c 100644
--- a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
+++ b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbs2_physical_cc_impl.h"
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -80,8 +79,8 @@ namespace gr {
         type |= 1;
       }
       if (goldcode < 0 || goldcode > 262141) {
-        fprintf(stderr, "Gold Code must be between 0 and 262141 inclusive.\n");
-        fprintf(stderr, "Gold Code set to 0.\n");
+        GR_LOG_WARN(d_logger, "Gold Code must be between 0 and 262141 inclusive.");
+        GR_LOG_WARN(d_logger, "Gold Code set to 0.");
         goldcode = 0;
       }
       gold_code = goldcode;
diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc
index c10a77c98a..4c67f62a60 100644
--- a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt_bit_inner_deinterleaver_impl.h"
-#include <stdio.h>
 
 #define MAX_MODULATION_ORDER 6
 #define INTERLEAVER_BLOCK_SIZE 126
@@ -34,37 +33,6 @@ namespace gr {
 
     const int dvbt_bit_inner_deinterleaver_impl::d_bsize = INTERLEAVER_BLOCK_SIZE;
 
-    int
-    dvbt_bit_inner_deinterleaver_impl::H(int e, int w)
-    {
-      int rez = 0;
-
-      switch (e) {
-        case 0:
-          rez = w;
-          break;
-        case 1:
-          rez = (w + 63) % d_bsize;
-          break;
-        case 2:
-          rez = (w + 105) % d_bsize;
-          break;
-        case 3:
-          rez = (w + 42) % d_bsize;
-          break;
-        case 4:
-          rez = (w + 21) % d_bsize;
-          break;
-        case 5:
-          rez = (w + 84) % d_bsize;
-          break;
-        default:
-          break;
-      }
-
-      return rez;
-    }
-
     dvbt_bit_inner_deinterleaver::sptr
     dvbt_bit_inner_deinterleaver::make(int nsize, \
         dvb_constellation_t constellation, dvbt_hierarchy_t hierarchy, dvbt_transmission_mode_t transmission)
@@ -88,10 +56,10 @@ namespace gr {
       d_v = config.d_m;
       d_hierarchy = config.d_hierarchy;
 
-      d_perm = (unsigned char *)new unsigned char[d_v * d_bsize];
+      d_perm = (unsigned char *)new (std::nothrow) unsigned char[d_v * d_bsize];
       if (d_perm == NULL) {
-        std::cout << "Cannot allocate memory for d_perm" << std::endl;
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Bit Inner Deinterleaver, cannot allocate memory for d_perm.");
+        throw std::bad_alloc();
       }
 
       //Init permutation table (used for b[e][do])
@@ -105,8 +73,8 @@ namespace gr {
       }
 
       if (d_nsize % d_bsize) {
-        std::cout << "Error: Input size must be multiple of block size: " \
-          << "nsize: " << d_nsize << "bsize: " << d_bsize << std::endl;
+        GR_LOG_ERROR(d_logger, boost::format("Input size must be multiple of block size: nsize: %1% bsize: %2%") \
+                     % d_nsize % d_bsize);
       }
     }
 
@@ -145,7 +113,7 @@ namespace gr {
           int c = in[(bcount * d_bsize) + w];
 
           for (int e = 0; e < d_v; e++) {
-            d_b[e][H(e, w)] = (c >> (d_v - e - 1)) & 1;
+            d_b[e][d_lookup_H[w][e]] = (c >> (d_v - e - 1)) & 1;
           }
         }
 
@@ -189,6 +157,136 @@ namespace gr {
       return noutput_items;
     }
 
+    const int dvbt_bit_inner_deinterleaver_impl::d_lookup_H[INTERLEAVER_BLOCK_SIZE][MAX_MODULATION_ORDER] =
+    {
+      {0, 63, 105, 42, 21, 84},
+      {1, 64, 106, 43, 22, 85},
+      {2, 65, 107, 44, 23, 86},
+      {3, 66, 108, 45, 24, 87},
+      {4, 67, 109, 46, 25, 88},
+      {5, 68, 110, 47, 26, 89},
+      {6, 69, 111, 48, 27, 90},
+      {7, 70, 112, 49, 28, 91},
+      {8, 71, 113, 50, 29, 92},
+      {9, 72, 114, 51, 30, 93},
+      {10, 73, 115, 52, 31, 94},
+      {11, 74, 116, 53, 32, 95},
+      {12, 75, 117, 54, 33, 96},
+      {13, 76, 118, 55, 34, 97},
+      {14, 77, 119, 56, 35, 98},
+      {15, 78, 120, 57, 36, 99},
+      {16, 79, 121, 58, 37, 100},
+      {17, 80, 122, 59, 38, 101},
+      {18, 81, 123, 60, 39, 102},
+      {19, 82, 124, 61, 40, 103},
+      {20, 83, 125, 62, 41, 104},
+      {21, 84, 0, 63, 42, 105},
+      {22, 85, 1, 64, 43, 106},
+      {23, 86, 2, 65, 44, 107},
+      {24, 87, 3, 66, 45, 108},
+      {25, 88, 4, 67, 46, 109},
+      {26, 89, 5, 68, 47, 110},
+      {27, 90, 6, 69, 48, 111},
+      {28, 91, 7, 70, 49, 112},
+      {29, 92, 8, 71, 50, 113},
+      {30, 93, 9, 72, 51, 114},
+      {31, 94, 10, 73, 52, 115},
+      {32, 95, 11, 74, 53, 116},
+      {33, 96, 12, 75, 54, 117},
+      {34, 97, 13, 76, 55, 118},
+      {35, 98, 14, 77, 56, 119},
+      {36, 99, 15, 78, 57, 120},
+      {37, 100, 16, 79, 58, 121},
+      {38, 101, 17, 80, 59, 122},
+      {39, 102, 18, 81, 60, 123},
+      {40, 103, 19, 82, 61, 124},
+      {41, 104, 20, 83, 62, 125},
+      {42, 105, 21, 84, 63, 0},
+      {43, 106, 22, 85, 64, 1},
+      {44, 107, 23, 86, 65, 2},
+      {45, 108, 24, 87, 66, 3},
+      {46, 109, 25, 88, 67, 4},
+      {47, 110, 26, 89, 68, 5},
+      {48, 111, 27, 90, 69, 6},
+      {49, 112, 28, 91, 70, 7},
+      {50, 113, 29, 92, 71, 8},
+      {51, 114, 30, 93, 72, 9},
+      {52, 115, 31, 94, 73, 10},
+      {53, 116, 32, 95, 74, 11},
+      {54, 117, 33, 96, 75, 12},
+      {55, 118, 34, 97, 76, 13},
+      {56, 119, 35, 98, 77, 14},
+      {57, 120, 36, 99, 78, 15},
+      {58, 121, 37, 100, 79, 16},
+      {59, 122, 38, 101, 80, 17},
+      {60, 123, 39, 102, 81, 18},
+      {61, 124, 40, 103, 82, 19},
+      {62, 125, 41, 104, 83, 20},
+      {63, 0, 42, 105, 84, 21},
+      {64, 1, 43, 106, 85, 22},
+      {65, 2, 44, 107, 86, 23},
+      {66, 3, 45, 108, 87, 24},
+      {67, 4, 46, 109, 88, 25},
+      {68, 5, 47, 110, 89, 26},
+      {69, 6, 48, 111, 90, 27},
+      {70, 7, 49, 112, 91, 28},
+      {71, 8, 50, 113, 92, 29},
+      {72, 9, 51, 114, 93, 30},
+      {73, 10, 52, 115, 94, 31},
+      {74, 11, 53, 116, 95, 32},
+      {75, 12, 54, 117, 96, 33},
+      {76, 13, 55, 118, 97, 34},
+      {77, 14, 56, 119, 98, 35},
+      {78, 15, 57, 120, 99, 36},
+      {79, 16, 58, 121, 100, 37},
+      {80, 17, 59, 122, 101, 38},
+      {81, 18, 60, 123, 102, 39},
+      {82, 19, 61, 124, 103, 40},
+      {83, 20, 62, 125, 104, 41},
+      {84, 21, 63, 0, 105, 42},
+      {85, 22, 64, 1, 106, 43},
+      {86, 23, 65, 2, 107, 44},
+      {87, 24, 66, 3, 108, 45},
+      {88, 25, 67, 4, 109, 46},
+      {89, 26, 68, 5, 110, 47},
+      {90, 27, 69, 6, 111, 48},
+      {91, 28, 70, 7, 112, 49},
+      {92, 29, 71, 8, 113, 50},
+      {93, 30, 72, 9, 114, 51},
+      {94, 31, 73, 10, 115, 52},
+      {95, 32, 74, 11, 116, 53},
+      {96, 33, 75, 12, 117, 54},
+      {97, 34, 76, 13, 118, 55},
+      {98, 35, 77, 14, 119, 56},
+      {99, 36, 78, 15, 120, 57},
+      {100, 37, 79, 16, 121, 58},
+      {101, 38, 80, 17, 122, 59},
+      {102, 39, 81, 18, 123, 60},
+      {103, 40, 82, 19, 124, 61},
+      {104, 41, 83, 20, 125, 62},
+      {105, 42, 84, 21, 0, 63},
+      {106, 43, 85, 22, 1, 64},
+      {107, 44, 86, 23, 2, 65},
+      {108, 45, 87, 24, 3, 66},
+      {109, 46, 88, 25, 4, 67},
+      {110, 47, 89, 26, 5, 68},
+      {111, 48, 90, 27, 6, 69},
+      {112, 49, 91, 28, 7, 70},
+      {113, 50, 92, 29, 8, 71},
+      {114, 51, 93, 30, 9, 72},
+      {115, 52, 94, 31, 10, 73},
+      {116, 53, 95, 32, 11, 74},
+      {117, 54, 96, 33, 12, 75},
+      {118, 55, 97, 34, 13, 76},
+      {119, 56, 98, 35, 14, 77},
+      {120, 57, 99, 36, 15, 78},
+      {121, 58, 100, 37, 16, 79},
+      {122, 59, 101, 38, 17, 80},
+      {123, 60, 102, 39, 18, 81},
+      {124, 61, 103, 40, 19, 82},
+      {125, 62, 104, 41, 20, 83}
+    };
+
   } /* namespace dtv */
 } /* namespace gr */
 
diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.h b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.h
index 9f3811301d..9d33f6124b 100644
--- a/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_deinterleaver_impl.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,8 @@ namespace gr {
      private:
       const dvbt_configure config;
 
+      static const int d_lookup_H[126][6];
+
       int d_nsize;
       dvbt_hierarchy_t d_hierarchy;
 
@@ -43,9 +45,6 @@ namespace gr {
       // Table to keep interleaved indices
       unsigned char * d_perm;
 
-      // Permutation function
-      int H(int e, int w);
-
      public:
       dvbt_bit_inner_deinterleaver_impl(int nsize, dvb_constellation_t constellation, dvbt_hierarchy_t hierarchy, dvbt_transmission_mode_t transmission);
       ~dvbt_bit_inner_deinterleaver_impl();
diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc
index 43146f02c5..07ba588f3e 100644
--- a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt_bit_inner_interleaver_impl.h"
-#include <stdio.h>
 
 #define MAX_MODULATION_ORDER 6
 #define INTERLEAVER_BLOCK_SIZE 126
@@ -34,36 +33,6 @@ namespace gr {
 
     const int dvbt_bit_inner_interleaver_impl::d_bsize = INTERLEAVER_BLOCK_SIZE;
 
-    int
-    dvbt_bit_inner_interleaver_impl::H(int e, int w)
-    {
-      int rez = 0;
-
-      switch (e) {
-        case 0:
-          rez = w;
-          break;
-        case 1:
-          rez = (w + 63) % d_bsize;
-          break;
-        case 2:
-          rez = (w + 105) % d_bsize;
-          break;
-        case 3:
-          rez = (w + 42) % d_bsize;
-          break;
-        case 4:
-          rez = (w + 21) % d_bsize;
-          break;
-        case 5:
-          rez = (w + 84) % d_bsize;
-          break;
-        default:
-          break;
-      }
-
-      return rez;
-    }
 
     dvbt_bit_inner_interleaver::sptr
     dvbt_bit_inner_interleaver::make(int nsize, \
@@ -88,10 +57,10 @@ namespace gr {
       d_v = config.d_m;
       d_hierarchy = config.d_hierarchy;
 
-      d_perm = (unsigned char *)new unsigned char[d_v * d_bsize];
+      d_perm = (unsigned char *)new (std::nothrow) unsigned char[d_v * d_bsize];
       if (d_perm == NULL) {
-        std::cout << "Cannot allocate memory for d_perm" << std::endl;
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Bit Inner Interleaver, cannot allocate memory for d_perm.");
+        throw std::bad_alloc();
       }
 
       //Init permutation table (used for b[e][do])
@@ -105,8 +74,8 @@ namespace gr {
       }
 
       if (d_nsize % d_bsize) {
-        std::cout << "Error: Input size must be multiple of block size: " \
-          << "nsize: " << d_nsize << "bsize: " << d_bsize << std::endl;
+        GR_LOG_ERROR(d_logger, boost::format("Input size must be multiple of block size: nsize: %1% bsize: %2%") \
+                     % d_nsize % d_bsize);
       }
     }
 
@@ -175,7 +144,7 @@ namespace gr {
           int val = 0;
 
           for (int e = 0; e < d_v; e++) {
-            val = (val << 1) | d_b[e][H(e, w)];
+            val = (val << 1) | d_b[e][d_lookup_H[w][e]];
           }
 
           out[(bcount * d_bsize) + w] = val;
@@ -190,6 +159,136 @@ namespace gr {
       return noutput_items;
     }
 
+    const int dvbt_bit_inner_interleaver_impl::d_lookup_H[INTERLEAVER_BLOCK_SIZE][MAX_MODULATION_ORDER] =
+    {
+      {0, 63, 105, 42, 21, 84},
+      {1, 64, 106, 43, 22, 85},
+      {2, 65, 107, 44, 23, 86},
+      {3, 66, 108, 45, 24, 87},
+      {4, 67, 109, 46, 25, 88},
+      {5, 68, 110, 47, 26, 89},
+      {6, 69, 111, 48, 27, 90},
+      {7, 70, 112, 49, 28, 91},
+      {8, 71, 113, 50, 29, 92},
+      {9, 72, 114, 51, 30, 93},
+      {10, 73, 115, 52, 31, 94},
+      {11, 74, 116, 53, 32, 95},
+      {12, 75, 117, 54, 33, 96},
+      {13, 76, 118, 55, 34, 97},
+      {14, 77, 119, 56, 35, 98},
+      {15, 78, 120, 57, 36, 99},
+      {16, 79, 121, 58, 37, 100},
+      {17, 80, 122, 59, 38, 101},
+      {18, 81, 123, 60, 39, 102},
+      {19, 82, 124, 61, 40, 103},
+      {20, 83, 125, 62, 41, 104},
+      {21, 84, 0, 63, 42, 105},
+      {22, 85, 1, 64, 43, 106},
+      {23, 86, 2, 65, 44, 107},
+      {24, 87, 3, 66, 45, 108},
+      {25, 88, 4, 67, 46, 109},
+      {26, 89, 5, 68, 47, 110},
+      {27, 90, 6, 69, 48, 111},
+      {28, 91, 7, 70, 49, 112},
+      {29, 92, 8, 71, 50, 113},
+      {30, 93, 9, 72, 51, 114},
+      {31, 94, 10, 73, 52, 115},
+      {32, 95, 11, 74, 53, 116},
+      {33, 96, 12, 75, 54, 117},
+      {34, 97, 13, 76, 55, 118},
+      {35, 98, 14, 77, 56, 119},
+      {36, 99, 15, 78, 57, 120},
+      {37, 100, 16, 79, 58, 121},
+      {38, 101, 17, 80, 59, 122},
+      {39, 102, 18, 81, 60, 123},
+      {40, 103, 19, 82, 61, 124},
+      {41, 104, 20, 83, 62, 125},
+      {42, 105, 21, 84, 63, 0},
+      {43, 106, 22, 85, 64, 1},
+      {44, 107, 23, 86, 65, 2},
+      {45, 108, 24, 87, 66, 3},
+      {46, 109, 25, 88, 67, 4},
+      {47, 110, 26, 89, 68, 5},
+      {48, 111, 27, 90, 69, 6},
+      {49, 112, 28, 91, 70, 7},
+      {50, 113, 29, 92, 71, 8},
+      {51, 114, 30, 93, 72, 9},
+      {52, 115, 31, 94, 73, 10},
+      {53, 116, 32, 95, 74, 11},
+      {54, 117, 33, 96, 75, 12},
+      {55, 118, 34, 97, 76, 13},
+      {56, 119, 35, 98, 77, 14},
+      {57, 120, 36, 99, 78, 15},
+      {58, 121, 37, 100, 79, 16},
+      {59, 122, 38, 101, 80, 17},
+      {60, 123, 39, 102, 81, 18},
+      {61, 124, 40, 103, 82, 19},
+      {62, 125, 41, 104, 83, 20},
+      {63, 0, 42, 105, 84, 21},
+      {64, 1, 43, 106, 85, 22},
+      {65, 2, 44, 107, 86, 23},
+      {66, 3, 45, 108, 87, 24},
+      {67, 4, 46, 109, 88, 25},
+      {68, 5, 47, 110, 89, 26},
+      {69, 6, 48, 111, 90, 27},
+      {70, 7, 49, 112, 91, 28},
+      {71, 8, 50, 113, 92, 29},
+      {72, 9, 51, 114, 93, 30},
+      {73, 10, 52, 115, 94, 31},
+      {74, 11, 53, 116, 95, 32},
+      {75, 12, 54, 117, 96, 33},
+      {76, 13, 55, 118, 97, 34},
+      {77, 14, 56, 119, 98, 35},
+      {78, 15, 57, 120, 99, 36},
+      {79, 16, 58, 121, 100, 37},
+      {80, 17, 59, 122, 101, 38},
+      {81, 18, 60, 123, 102, 39},
+      {82, 19, 61, 124, 103, 40},
+      {83, 20, 62, 125, 104, 41},
+      {84, 21, 63, 0, 105, 42},
+      {85, 22, 64, 1, 106, 43},
+      {86, 23, 65, 2, 107, 44},
+      {87, 24, 66, 3, 108, 45},
+      {88, 25, 67, 4, 109, 46},
+      {89, 26, 68, 5, 110, 47},
+      {90, 27, 69, 6, 111, 48},
+      {91, 28, 70, 7, 112, 49},
+      {92, 29, 71, 8, 113, 50},
+      {93, 30, 72, 9, 114, 51},
+      {94, 31, 73, 10, 115, 52},
+      {95, 32, 74, 11, 116, 53},
+      {96, 33, 75, 12, 117, 54},
+      {97, 34, 76, 13, 118, 55},
+      {98, 35, 77, 14, 119, 56},
+      {99, 36, 78, 15, 120, 57},
+      {100, 37, 79, 16, 121, 58},
+      {101, 38, 80, 17, 122, 59},
+      {102, 39, 81, 18, 123, 60},
+      {103, 40, 82, 19, 124, 61},
+      {104, 41, 83, 20, 125, 62},
+      {105, 42, 84, 21, 0, 63},
+      {106, 43, 85, 22, 1, 64},
+      {107, 44, 86, 23, 2, 65},
+      {108, 45, 87, 24, 3, 66},
+      {109, 46, 88, 25, 4, 67},
+      {110, 47, 89, 26, 5, 68},
+      {111, 48, 90, 27, 6, 69},
+      {112, 49, 91, 28, 7, 70},
+      {113, 50, 92, 29, 8, 71},
+      {114, 51, 93, 30, 9, 72},
+      {115, 52, 94, 31, 10, 73},
+      {116, 53, 95, 32, 11, 74},
+      {117, 54, 96, 33, 12, 75},
+      {118, 55, 97, 34, 13, 76},
+      {119, 56, 98, 35, 14, 77},
+      {120, 57, 99, 36, 15, 78},
+      {121, 58, 100, 37, 16, 79},
+      {122, 59, 101, 38, 17, 80},
+      {123, 60, 102, 39, 18, 81},
+      {124, 61, 103, 40, 19, 82},
+      {125, 62, 104, 41, 20, 83}
+    };
+
   } /* namespace dtv */
 } /* namespace gr */
 
diff --git a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.h b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.h
index c5fcbe2d82..5fc5e109f8 100644
--- a/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,8 @@ namespace gr {
      private:
       const dvbt_configure config;
 
+      static const int d_lookup_H[126][6];
+
       int d_nsize;
       dvbt_hierarchy_t d_hierarchy;
 
@@ -43,9 +45,6 @@ namespace gr {
       // Table to keep interleaved indices
       unsigned char * d_perm;
 
-      // Permutation function
-      int H(int e, int w);
-
      public:
       dvbt_bit_inner_interleaver_impl(int nsize, dvb_constellation_t constellation, dvbt_hierarchy_t hierarchy, dvbt_transmission_mode_t transmission);
       ~dvbt_bit_inner_interleaver_impl();
diff --git a/gr-dtv/lib/dvbt/dvbt_configure.cc b/gr-dtv/lib/dvbt/dvbt_configure.cc
index acf9862e74..33f5cc838b 100644
--- a/gr-dtv/lib/dvbt/dvbt_configure.cc
+++ b/gr-dtv/lib/dvbt/dvbt_configure.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
 #include <gnuradio/io_signature.h>
 #include "dvbt_configure.h"
 #include <iostream>
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
diff --git a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc
index 4bdec1dc96..65d659226c 100644
--- a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
 #include <gnuradio/io_signature.h>
 #include "dvbt_demap_impl.h"
 #include <volk/volk.h>
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -62,15 +61,15 @@ namespace gr {
 
       d_constellation_points = (gr_complex*) volk_malloc(sizeof(gr_complex) * d_constellation_size, volk_get_alignment());
       if (d_constellation_points == NULL) {
-        std::cout << "cannot allocate memory for d_constellation_points" << std::endl;
-        exit(1);
+        GR_LOG_FATAL(d_logger, "DVB-T Demap, cannot allocate memory for d_constellation_points.");
+        throw std::bad_alloc();
       }
 
       d_sq_dist = (float*) volk_malloc(sizeof(float) * d_constellation_size, volk_get_alignment());
       if (d_sq_dist == NULL) {
-        std::cout << "cannot allocate memory for d_sq_dist" << std::endl;
+        GR_LOG_FATAL(d_logger, "DVB-T Demap, cannot allocate memory for d_sq_dist.");
         volk_free(d_constellation_points);
-        exit(1);
+        throw std::bad_alloc();
       }
 
       make_constellation_points(d_constellation_size, d_step, d_alpha);
diff --git a/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc b/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc
index 03dd0ffec5..ff8042f2c8 100644
--- a/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt_energy_dispersal_impl.h"
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -121,7 +120,7 @@ namespace gr {
 
           for (int j = 0; j < d_npacks; j++) {
             if (in[index + count] != d_SYNC) {
-              printf("error: Malformed MPEG-TS!\n");
+              GR_LOG_WARN(d_logger, "Malformed MPEG-TS!");
             }
 
             out[count++] = sync;
diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
index 54d25e49ea..0787464aa2 100644
--- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,27 +24,21 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt_inner_coder_impl.h"
-#include <stdio.h>
 #include <assert.h>
 
 namespace gr {
   namespace dtv {
 
-    void
+    inline void
     dvbt_inner_coder_impl::generate_codeword(unsigned char in, int &x, int &y)
     {
       //insert input bit
       d_reg |= ((in & 0x1) << 7);
 
-      d_reg  = d_reg >> 1;
+      d_reg = d_reg >> 1;
 
-      // TODO - do this with polynoms and bitcnt
-      //generate output G1=171(OCT)
-      x = ((d_reg >> 6) ^ (d_reg >> 5) ^ (d_reg >> 4) ^ \
-                        (d_reg >> 3) ^ d_reg) & 0x1;
-      //generate output G2=133(OCT)
-      y = ((d_reg >> 6) ^ (d_reg >> 4) ^ (d_reg >> 3) ^ \
-                        (d_reg >> 1) ^ d_reg) & 0x1;
+      x = d_lookup_171[d_reg];
+      y = d_lookup_133[d_reg];
     }
 
     //TODO - do this based on puncturing matrix
@@ -55,7 +49,7 @@ namespace gr {
      * 00000c0c1c2
      */
 
-    void
+    inline void
     dvbt_inner_coder_impl::generate_punctured_code(dvb_code_rate_t coderate, unsigned char * in, unsigned char * out)
     {
       int x, y;
@@ -175,17 +169,17 @@ namespace gr {
       d_out_bs = 4 * d_n;
 
       // allocate bit buffers
-      d_in_buff = new unsigned char[8 * d_in_bs];
+      d_in_buff = new (std::nothrow) unsigned char[8 * d_in_bs];
       if (d_in_buff == NULL) {
-        std::cout << "Cannot allocate memory for d_in_buff" << std::endl;
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Inner Coder, cannot allocate memory for d_in_buff.");
+        throw std::bad_alloc();
       }
 
-      d_out_buff = new unsigned char[8 * d_in_bs * d_n / d_k];
+      d_out_buff = new (std::nothrow) unsigned char[8 * d_in_bs * d_n / d_k];
       if (d_out_buff == NULL) {
-        std::cout << "Cannot allocate memory for d_out_buff" << std::endl;
+        GR_LOG_FATAL(d_logger, "Inner Coder, cannot allocate memory for d_out_buff.");
         delete [] d_in_buff;
-        exit(1);
+        throw std::bad_alloc();
       }
     }
 
@@ -251,6 +245,26 @@ namespace gr {
       return noutput_items;
     }
 
+    const int dvbt_inner_coder_impl::d_lookup_171[128] = 
+    {0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0,
+     1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1,
+     1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1,
+     0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0,
+     1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1,
+     0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0,
+     0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0,
+     1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1};
+
+    const int dvbt_inner_coder_impl::d_lookup_133[128] =
+    {0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1,
+     1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
+     0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1,
+     1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
+     1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
+     0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1,
+     1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0,
+     0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1};
+
   } /* namespace dtv */
 } /* namespace gr */
 
diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h
index 7a46a2222c..d472b1f60c 100644
--- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,9 @@ namespace gr {
      private:
       const dvbt_configure config;
 
+      static const int d_lookup_171[128];
+      static const int d_lookup_133[128];
+
       int d_ninput;
       int d_noutput;
 
@@ -57,8 +60,8 @@ namespace gr {
       // bit output buffer
       unsigned char * d_out_buff;
 
-      void generate_codeword(unsigned char in, int &x, int &y);
-      void generate_punctured_code(dvb_code_rate_t coderate, unsigned char * in, unsigned char * out);
+      inline void generate_codeword(unsigned char in, int &x, int &y);
+      inline void generate_punctured_code(dvb_code_rate_t coderate, unsigned char * in, unsigned char * out);
 
      public:
       dvbt_inner_coder_impl(int ninput, int noutput, dvb_constellation_t constellation, dvbt_hierarchy_t hierarchy, dvb_code_rate_t coderate);
diff --git a/gr-dtv/lib/dvbt/dvbt_map_impl.cc b/gr-dtv/lib/dvbt/dvbt_map_impl.cc
index 05f6e7f69b..b2c21da525 100644
--- a/gr-dtv/lib/dvbt/dvbt_map_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_map_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
 #include <gnuradio/io_signature.h>
 #include <complex>
 #include "dvbt_map_impl.h"
-#include <stdio.h>
 #include <math.h>
 
 namespace gr {
@@ -59,10 +58,10 @@ namespace gr {
       d_alpha = config.d_alpha;
       d_gain = gain * config.d_norm;
 
-      d_constellation_points = new gr_complex[d_constellation_size];
+      d_constellation_points = new (std::nothrow) gr_complex[d_constellation_size];
       if (d_constellation_points == NULL) {
-        std::cout << "Cannot allocate memory for d_constellation_points" << std::endl;
-        exit(1);
+        GR_LOG_FATAL(d_logger, "DVB-T Map, cannot allocate memory for d_constellation_points.");
+        throw std::bad_alloc();
       }
 
       make_constellation_points(d_constellation_size, d_step, d_alpha);
diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
index ee8dce0f15..135d622eef 100644
--- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include <complex>
 #include <gnuradio/math.h>
 #include <gnuradio/expj.h>
-#include <stdio.h>
 #include <volk/volk.h>
 
 namespace gr {
@@ -247,53 +246,53 @@ namespace gr {
 
       d_gamma = (gr_complex*) volk_malloc(sizeof(gr_complex) * d_fft_length, volk_get_alignment());
       if (d_gamma == NULL) {
-        std::cout << "cannot allocate memory for d_gamma" << std::endl;
-        exit(1);
+        GR_LOG_FATAL(d_logger, "OFDM Symbol Acquisition, cannot allocate memory for d_gamma.");
+        throw std::bad_alloc();
       }
 
       d_lambda = (float*) volk_malloc(sizeof(float) * d_fft_length, volk_get_alignment());
       if (d_lambda == NULL) {
-        std::cout << "cannot allocate memory for d_lambda" << std::endl;
+        GR_LOG_FATAL(d_logger, "OFDM Symbol Acquisition, cannot allocate memory for d_lambda.");
         volk_free(d_gamma);
-        exit(1);
+        throw std::bad_alloc();
       }
 
       d_derot = (gr_complex*) volk_malloc(sizeof(gr_complex) * (d_fft_length + d_cp_length), volk_get_alignment());
       if (d_derot == NULL) {
-        std::cout << "cannot allocate memory for d_derot" << std::endl;
+        GR_LOG_FATAL(d_logger, "OFDM Symbol Acquisition, cannot allocate memory for d_derot.");
         volk_free(d_lambda);
         volk_free(d_gamma);
-        exit(1);
+        throw std::bad_alloc();
       }
 
       d_conj = (gr_complex*) volk_malloc(sizeof(gr_complex) * (2 * d_fft_length + d_cp_length), volk_get_alignment());
       if (d_conj == NULL) {
-        std::cout << "cannot allocate memory for d_conj" << std::endl;
+        GR_LOG_FATAL(d_logger, "OFDM Symbol Acquisition, cannot allocate memory for d_conj.");
         volk_free(d_derot);
         volk_free(d_lambda);
         volk_free(d_gamma);
-        exit(1);
+        throw std::bad_alloc();
       }
 
       d_norm = (float*) volk_malloc(sizeof(float) * (2 * d_fft_length + d_cp_length), volk_get_alignment());
       if (d_norm == NULL) {
-        std::cout << "cannot allocate memory for d_norm" << std::endl;
+        GR_LOG_FATAL(d_logger, "OFDM Symbol Acquisition, cannot allocate memory for d_norm.");
         volk_free(d_conj);
         volk_free(d_derot);
         volk_free(d_lambda);
         volk_free(d_gamma);
-        exit(1);
+        throw std::bad_alloc();
       }
 
       d_corr = (gr_complex*) volk_malloc(sizeof(gr_complex) * (2 * d_fft_length + d_cp_length), volk_get_alignment());
       if (d_corr == NULL) {
-        std::cout << "cannot allocate memory for d_corr" << std::endl;
+        GR_LOG_FATAL(d_logger, "OFDM Symbol Acquisition, cannot allocate memory for d_corr.");
         volk_free(d_norm);
         volk_free(d_conj);
         volk_free(d_derot);
         volk_free(d_lambda);
         volk_free(d_gamma);
-        exit(1);
+        throw std::bad_alloc();
       }
 
       peak_detect_init(0.3, 0.9);
diff --git a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc
index f2e370a51f..fd6fedcf8d 100644
--- a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt_reed_solomon_dec_impl.h"
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -52,8 +51,8 @@ namespace gr {
     {
       d_rs = init_rs_char(rs_init_symsize, gfpoly, rs_init_fcr, rs_init_prim, (n - k));
       if (d_rs == NULL) {
-        fprintf(stderr, "Reed-Solomon decoder, Out of memory.\n");
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Reed-Solomon Decoder, cannot allocate memory for d_rs.");
+        throw std::bad_alloc();
       }
       d_nerrors_corrected_count = 0;
       d_bad_packet_count = 0;
diff --git a/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc b/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc
index 3bc186055d..663301d614 100644
--- a/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt_reed_solomon_enc_impl.h"
-#include <stdio.h>
 
 #define MPEG_TS_PKT_LENGTH 188
 
@@ -53,14 +52,14 @@ namespace gr {
     {
       d_rs = init_rs_char(rs_init_symsize, gfpoly, rs_init_fcr, rs_init_prim, (n - k));
       if (d_rs == NULL) {
-        fprintf(stderr, "Reed-Solomon encoder, Out of memory.\n");
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Reed-Solomon Encoder, cannot allocate memory for d_rs.");
+        throw std::bad_alloc();
       }
       d_data = (unsigned char *) malloc(sizeof(unsigned char) * (d_s + MPEG_TS_PKT_LENGTH));
       if (d_data == NULL) {
-        fprintf(stderr, "Reed-Solomon encoder, Out of memory.\n");
+        GR_LOG_FATAL(d_logger, "Reed-Solomon Encoder, cannot allocate memory for d_data.");
         free_rs_char(d_rs);
-        exit(1);
+        throw std::bad_alloc();
       }
     }
 
diff --git a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc
index b3c7046ae2..aa581aeda8 100644
--- a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
 #include <gnuradio/io_signature.h>
 #include "dvbt_reference_signals_impl.h"
 #include <complex>
-#include <stdio.h>
 #include <gnuradio/expj.h>
 #include <gnuradio/math.h>
 
@@ -173,37 +172,37 @@ namespace gr {
       //allocate PRBS buffer
       d_wk = new char[d_Kmax - d_Kmin + 1];
       if (d_wk == NULL) {
-        std::cout << "Cannot allocate memory for d_wk" << std::endl;
-        exit(1);
+        std::cerr << "Reference Signals, cannot allocate memory for d_wk." << std::endl;
+        throw std::bad_alloc();
       }
       // Generate wk sequence
       generate_prbs();
 
       // allocate buffer for scattered pilots
-      d_spilot_carriers_val = new gr_complex[d_Kmax - d_Kmin + 1];
+      d_spilot_carriers_val = new (std::nothrow) gr_complex[d_Kmax - d_Kmin + 1];
       if (d_spilot_carriers_val == NULL) {
-        std::cout << "Cannot allocate memory for d_spilot_carriers_val" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_spilot_carriers_val." << std::endl;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
 
       // allocate buffer for channel gains (for each useful carrier)
-      d_channel_gain = new gr_complex[d_Kmax - d_Kmin + 1];
+      d_channel_gain = new (std::nothrow) gr_complex[d_Kmax - d_Kmin + 1];
       if (d_channel_gain == NULL) {
-        std::cout << "Cannot allocate memory for d_channel_gain" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_channel_gain." << std::endl;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
 
       // Allocate buffer for continual pilots phase diffs
-      d_known_phase_diff = new float[d_cpilot_carriers_size - 1];
+      d_known_phase_diff = new (std::nothrow) float[d_cpilot_carriers_size - 1];
       if (d_known_phase_diff == NULL) {
-        std::cout << "Cannot allocate memory for d_known_phase_diff" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_known_phase_diff." << std::endl;
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
 
       // Obtain phase diff for all continual pilots
@@ -212,45 +211,45 @@ namespace gr {
           norm(get_cpilot_value(d_cpilot_carriers[i + 1]) - get_cpilot_value(d_cpilot_carriers[i]));
       }
 
-      d_cpilot_phase_diff = new float[d_cpilot_carriers_size - 1];
+      d_cpilot_phase_diff = new (std::nothrow) float[d_cpilot_carriers_size - 1];
       if (d_cpilot_phase_diff == NULL) {
-        std::cout << "Cannot allocate memory for d_cpilot_phase_diff" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_cpilot_phase_diff." << std::endl;
         delete [] d_known_phase_diff;
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
 
       // Allocate buffer for derotated input symbol
-      d_derot_in = new gr_complex[d_fft_length];
+      d_derot_in = new (std::nothrow) gr_complex[d_fft_length];
       if (d_derot_in == NULL) {
-        std::cout << "Cannot allocate memory for d_derot_in" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_derot_in." << std::endl;
         delete [] d_cpilot_phase_diff;
         delete [] d_known_phase_diff;
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
 
       // allocate buffer for first tps symbol constellation
-      d_tps_carriers_val = new gr_complex[d_tps_carriers_size];
+      d_tps_carriers_val = new (std::nothrow) gr_complex[d_tps_carriers_size];
       if (d_tps_carriers_val == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_carriers_val" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_tps_carriers_val." << std::endl;
         delete [] d_derot_in;
         delete [] d_cpilot_phase_diff;
         delete [] d_known_phase_diff;
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
 
       // allocate tps data buffer
-      d_tps_data = new unsigned char[d_symbols_per_frame];
+      d_tps_data = new (std::nothrow) unsigned char[d_symbols_per_frame];
       if (d_tps_data == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_data" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_tps_data." << std::endl;
         delete [] d_tps_carriers_val;
         delete [] d_derot_in;
         delete [] d_cpilot_phase_diff;
@@ -258,12 +257,12 @@ namespace gr {
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
 
-      d_prev_tps_symbol = new gr_complex[d_tps_carriers_size];
+      d_prev_tps_symbol = new (std::nothrow) gr_complex[d_tps_carriers_size];
       if (d_prev_tps_symbol == NULL) {
-        std::cout << "Cannot allocate memory for d_prev_tps_symbol" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_prev_tps_symbol." << std::endl;
         delete [] d_tps_data;
         delete [] d_tps_carriers_val;
         delete [] d_derot_in;
@@ -272,13 +271,13 @@ namespace gr {
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
       memset(d_prev_tps_symbol, 0, d_tps_carriers_size * sizeof(gr_complex));
 
-      d_tps_symbol = new gr_complex[d_tps_carriers_size];
+      d_tps_symbol = new (std::nothrow) gr_complex[d_tps_carriers_size];
       if (d_tps_symbol == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_symbol" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_tps_symbol." << std::endl;
         delete [] d_prev_tps_symbol;
         delete [] d_tps_data;
         delete [] d_tps_carriers_val;
@@ -288,7 +287,7 @@ namespace gr {
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
       memset(d_tps_symbol, 0, d_tps_carriers_size * sizeof(gr_complex));
 
@@ -304,9 +303,9 @@ namespace gr {
       }
 
       // Allocate buffer for channel estimation carriers
-      d_chanestim_carriers = new int[d_Kmax - d_Kmin + 1];
+      d_chanestim_carriers = new (std::nothrow) int[d_Kmax - d_Kmin + 1];
       if (d_chanestim_carriers == NULL) {
-        std::cout << "Cannot allocate memory for d_chanestim_carriers" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_chanestim_carriers." << std::endl;
         delete [] d_tps_symbol;
         delete [] d_prev_tps_symbol;
         delete [] d_tps_data;
@@ -317,13 +316,13 @@ namespace gr {
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
 
       // Allocate buffer for payload carriers
-      d_payload_carriers = new int[d_Kmax - d_Kmin + 1];
+      d_payload_carriers = new (std::nothrow) int[d_Kmax - d_Kmin + 1];
       if (d_payload_carriers == NULL) {
-        std::cout << "Cannot allocate memory for d_payload_carriers" << std::endl;
+        std::cerr << "Reference Signals, cannot allocate memory for d_payload_carriers." << std::endl;
         delete [] d_chanestim_carriers;
         delete [] d_tps_symbol;
         delete [] d_prev_tps_symbol;
@@ -335,7 +334,7 @@ namespace gr {
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
-        exit(1);
+        throw std::bad_alloc();
       }
 
       // Reset the pilot generator
diff --git a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc
index 8bdfbf9776..1edd15a109 100644
--- a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt_symbol_inner_interleaver_impl.h"
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -125,10 +124,10 @@ namespace gr {
       assert(d_payload_length == d_nsize);
 
       // Allocate memory for h vector
-      d_h = new int[d_fft_length];
+      d_h = new (std::nothrow) int[d_fft_length];
       if (d_h == NULL) {
-        std::cout << "Cannot allocate memory for d_h" << std::endl;
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Symbol Inner Interleaver, cannot allocate memory for d_h.");
+        throw std::bad_alloc();
       }
 
       // Setup bit permutation vectors
diff --git a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc
index 05554c55fa..d76016d41c 100644
--- a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt_viterbi_decoder_impl.h"
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -597,10 +596,10 @@ namespace gr {
       d_nout = d_nbits / 2 / 8;
 
       // Allocate the buffer for the bits
-      d_inbits = new unsigned char [d_nbits];
+      d_inbits = new (std::nothrow) unsigned char [d_nbits];
       if (d_inbits == NULL) {
-        std::cout << "Cannot allocate memory for d_inbits" << std::endl;
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Viterbi Decoder, cannot allocate memory for d_inbits.");
+        throw std::bad_alloc();
       }
 
       mettab[0][0] = 1;
diff --git a/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc
index feaf3e29f4..ad401feed3 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_cellinterleaver_cc_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt2_cellinterleaver_cc_impl.h"
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -175,14 +174,14 @@ namespace gr {
       }
       time_interleave = (gr_complex *) malloc(sizeof(gr_complex) * cell_size * fecblocks);
       if (time_interleave == NULL) {
-        fprintf(stderr, "Cell interleaver 1st malloc, Out of memory.\n");
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Cell/Time Interleaver, cannot allocate memory for time_interleave.");
+        throw std::bad_alloc();
       }
       cols = (gr_complex **) malloc(sizeof(gr_complex *) * FECBlocksPerBigTIBlock * 5);
       if (cols == NULL) {
         free(time_interleave);
-        fprintf(stderr, "Cell interleaver 2nd malloc, Out of memory.\n");
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Cell/Time Interleaver, cannot allocate memory for cols.");
+        throw std::bad_alloc();
       }
       ti_blocks = tiblocks;
       fec_blocks = fecblocks;
diff --git a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
index 5e47faca10..1755fc82ca 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include <gnuradio/io_signature.h>
 #include "dvbt2_framemapper_cc_impl.h"
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -910,33 +909,33 @@ namespace gr {
         set_output_multiple((N_P2 * C_P2) + (numdatasyms * C_DATA));
         mapped_items = (N_P2 * C_P2) + (numdatasyms * C_DATA);
         if (mapped_items < (stream_items + 1840 + (N_post / eta_mod) + (N_FC - C_FC))) {
-          fprintf(stderr, "Too many FEC blocks in T2 frame.\n");
+          GR_LOG_WARN(d_logger, "Frame Mapper, too many FEC blocks in T2 frame.");
           mapped_items = stream_items + 1840 + (N_post / eta_mod) + (N_FC - C_FC);    /* avoid segfault */
         }
         zigzag_interleave = (gr_complex *) malloc(sizeof(gr_complex) * mapped_items);
         if (zigzag_interleave == NULL) {
-          fprintf(stderr, "Frame mapper 1st malloc, Out of memory.\n");
-          exit(1);
+          GR_LOG_FATAL(d_logger, "Frame Mapper, cannot allocate memory for zigzag_interleave.");
+          throw std::bad_alloc();
         }
       }
       else {
         set_output_multiple((N_P2 * C_P2) + ((numdatasyms - 1) * C_DATA) + N_FC);
         mapped_items = (N_P2 * C_P2) + ((numdatasyms - 1) * C_DATA) + N_FC;
         if (mapped_items < (stream_items + 1840 + (N_post / eta_mod) + (N_FC - C_FC))) {
-          fprintf(stderr, "Too many FEC blocks in T2 frame.\n");
+          GR_LOG_WARN(d_logger, "Frame Mapper, too many FEC blocks in T2 frame.");
           mapped_items = stream_items + 1840 + (N_post / eta_mod) + (N_FC - C_FC);    /* avoid segfault */
         }
         zigzag_interleave = (gr_complex *) malloc(sizeof(gr_complex) * mapped_items);
         if (zigzag_interleave == NULL) {
-          fprintf(stderr, "Frame mapper 1st malloc, Out of memory.\n");
-          exit(1);
+          GR_LOG_FATAL(d_logger, "Frame Mapper, cannot allocate memory for zigzag_interleave.");
+          throw std::bad_alloc();
         }
       }
       dummy_randomize = (gr_complex *) malloc(sizeof(gr_complex) * mapped_items - stream_items - 1840 - (N_post / eta_mod) - (N_FC - C_FC));
       if (dummy_randomize == NULL) {
         free(zigzag_interleave);
-        fprintf(stderr, "Frame mapper 2nd malloc, Out of memory.\n");
-        exit(1);
+        GR_LOG_FATAL(d_logger, "Frame Mapper, cannot allocate memory for dummy_randomize.");
+        throw std::bad_alloc();
       }
       init_dummy_randomizer();
       init_l1_randomizer();
diff --git a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
index 82b7c94d5f..9ebfb143ed 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_interleaver_bb_impl.cc
@@ -249,7 +249,10 @@ namespace gr {
               offset = twist[col];
               for (int row = 0; row < rows; row++) {
                 tempv[offset + (rows * col)] = tempu[index++];
-                offset = (offset + 1) % rows;
+                offset++;
+                if (offset == rows) {
+                  offset = 0;
+                }
               }
             }
             index = 0;
@@ -327,7 +330,10 @@ namespace gr {
               offset = twist[col];
               for (int row = 0; row < rows; row++) {
                 tempv[offset + (rows * col)] = tempu[index++];
-                offset = (offset + 1) % rows;
+                offset++;
+                if (offset == rows) {
+                  offset = 0;
+                }
               }
             }
             index = 0;
@@ -406,7 +412,10 @@ namespace gr {
                 offset = twist256n[col];
                 for (int row = 0; row < rows; row++) {
                   tempv[offset + (rows * col)] = tempu[index++];
-                  offset = (offset + 1) % rows;
+                  offset++;
+                  if (offset == rows) {
+                    offset = 0;
+                  }
                 }
               }
               index = 0;
@@ -479,7 +488,10 @@ namespace gr {
                 offset = twist256s[col];
                 for (int row = 0; row < rows; row++) {
                   tempv[offset + (rows * col)] = tempu[index++];
-                  offset = (offset + 1) % rows;
+                  offset++;
+                  if (offset == rows) {
+                    offset = 0;
+                  }
                 }
               }
               index = 0;
diff --git a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
index fc091bd70d..cec39a7041 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@
 #include <gnuradio/io_signature.h>
 #include "dvbt2_paprtr_cc_impl.h"
 #include <volk/volk.h>
-#include <stdio.h>
 
 namespace gr {
   namespace dtv {
@@ -518,61 +517,65 @@ namespace gr {
       left_nulls = ((vlength - C_PS) / 2) + 1;
       right_nulls = (vlength - C_PS) / 2;
       papr_fft_size = vlength;
-      papr_fft = new fft::fft_complex(papr_fft_size, false, 1);
+      papr_fft = new (std::nothrow) fft::fft_complex(papr_fft_size, false, 1);
+      if (papr_fft == NULL) {
+        GR_LOG_FATAL(d_logger, "Tone Reservation PAPR, cannot allocate memory for papr_fft.");
+        throw std::bad_alloc();
+      }
       ones_freq = (gr_complex*) volk_malloc(sizeof(gr_complex) * papr_fft_size, volk_get_alignment());
       if (ones_freq == NULL) {
-        fprintf(stderr, "Tone reservation PAPR 1st volk_malloc, Out of memory.\n");
+        GR_LOG_FATAL(d_logger, "Tone Reservation PAPR, cannot allocate memory for ones_freq.");
         delete papr_fft;
-        exit(1);
+        throw std::bad_alloc();
       }
       ones_time = (gr_complex*) volk_malloc(sizeof(gr_complex) * papr_fft_size, volk_get_alignment());
       if (ones_time == NULL) {
-        fprintf(stderr, "Tone reservation PAPR 2nd volk_malloc, Out of memory.\n");
+        GR_LOG_FATAL(d_logger, "Tone Reservation PAPR, cannot allocate memory for ones_time.");
         volk_free(ones_freq);
         delete papr_fft;
-        exit(1);
+        throw std::bad_alloc();
       }
       c = (gr_complex*) volk_malloc(sizeof(gr_complex) * papr_fft_size, volk_get_alignment());
       if (c == NULL) {
-        fprintf(stderr, "Tone reservation PAPR 3rd volk_malloc, Out of memory.\n");
+        GR_LOG_FATAL(d_logger, "Tone Reservation PAPR, cannot allocate memory for c.");
         volk_free(ones_time);
         volk_free(ones_freq);
         delete papr_fft;
-        exit(1);
+        throw std::bad_alloc();
       }
       ctemp = (gr_complex*) volk_malloc(sizeof(gr_complex) * papr_fft_size, volk_get_alignment());
       if (ctemp == NULL) {
-        fprintf(stderr, "Tone reservation PAPR 4th volk_malloc, Out of memory.\n");
+        GR_LOG_FATAL(d_logger, "Tone Reservation PAPR, cannot allocate memory for ctemp.");
         volk_free(c);
         volk_free(ones_time);
         volk_free(ones_freq);
         delete papr_fft;
-        exit(1);
+        throw std::bad_alloc();
       }
       magnitude = (float*) volk_malloc(sizeof(float) * papr_fft_size, volk_get_alignment());
       if (magnitude == NULL) {
-        fprintf(stderr, "Tone reservation PAPR 5th volk_malloc, Out of memory.\n");
+        GR_LOG_FATAL(d_logger, "Tone Reservation PAPR, cannot allocate memory for magnitude.");
         volk_free(ctemp);
         volk_free(c);
         volk_free(ones_time);
         volk_free(ones_freq);
         delete papr_fft;
-        exit(1);
+        throw std::bad_alloc();
       }
       r = (gr_complex*) volk_malloc(sizeof(gr_complex) * N_TR, volk_get_alignment());
       if (r == NULL) {
-        fprintf(stderr, "Tone reservation PAPR 6th volk_malloc, Out of memory.\n");
+        GR_LOG_FATAL(d_logger, "Tone Reservation PAPR, cannot allocate memory for r.");
         volk_free(magnitude);
         volk_free(ctemp);
         volk_free(c);
         volk_free(ones_time);
         volk_free(ones_freq);
         delete papr_fft;
-        exit(1);
+        throw std::bad_alloc();
       }
       rNew = (gr_complex*) volk_malloc(sizeof(gr_complex) * N_TR, volk_get_alignment());
       if (rNew == NULL) {
-        fprintf(stderr, "Tone reservation PAPR 7th volk_malloc, Out of memory.\n");
+        GR_LOG_FATAL(d_logger, "Tone Reservation PAPR, cannot allocate memory for rNew.");
         volk_free(r);
         volk_free(magnitude);
         volk_free(ctemp);
@@ -580,11 +583,11 @@ namespace gr {
         volk_free(ones_time);
         volk_free(ones_freq);
         delete papr_fft;
-        exit(1);
+        throw std::bad_alloc();
       }
       v = (gr_complex*) volk_malloc(sizeof(gr_complex) * N_TR, volk_get_alignment());
       if (v == NULL) {
-        fprintf(stderr, "Tone reservation PAPR 8th volk_malloc, Out of memory.\n");
+        GR_LOG_FATAL(d_logger, "Tone Reservation PAPR, cannot allocate memory for v.");
         volk_free(rNew);
         volk_free(r);
         volk_free(magnitude);
@@ -593,7 +596,7 @@ namespace gr {
         volk_free(ones_time);
         volk_free(ones_freq);
         delete papr_fft;
-        exit(1);
+        throw std::bad_alloc();
       }
       num_symbols = numdatasyms + N_P2;
       set_output_multiple(num_symbols);
diff --git a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
index 26c83492b9..2bb19f5189 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /* 
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015,2016 Free Software Foundation, Inc.
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1131,7 +1131,11 @@ namespace gr {
       }
       equalization_enable = equalization;
       ofdm_fft_size = vlength;
-      ofdm_fft = new fft::fft_complex(ofdm_fft_size, false, 1);
+      ofdm_fft = new (std::nothrow) fft::fft_complex(ofdm_fft_size, false, 1);
+      if (ofdm_fft == NULL) {
+        GR_LOG_FATAL(d_logger, "Pilot Generator and IFFT, cannot allocate memory for ofdm_fft.");
+        throw std::bad_alloc();
+      }
       num_symbols = numdatasyms + N_P2;
       set_output_multiple(num_symbols);
     }
author	Johnathan Corgan <johnathan@corganlabs.com>	2016-08-31 12:28:44 -0700
committer	Johnathan Corgan <johnathan@corganlabs.com>	2016-08-31 12:28:44 -0700
commit	e66d243be4043d8870affc6fe5036bfae0d5163b (patch)
tree	ce428f62ac728b72cf56570af1fb4b8dbe9ea1d3 /gr-dtv
parent	a7a57791d452fb2543de178ae72cfd63581bf80e (diff)
parent	bb8a76f7f95bb95aeff0f3d96f50e70fcb22c7ea (diff)