diff --git a/simulations/awgn/.gitignore b/simulations/awgn/.gitignore
new file mode 100644
index 0000000..e343d66
--- /dev/null
+++ b/simulations/awgn/.gitignore
@@ -0,0 +1,2 @@
+results/
+sim.py
diff --git a/utils/simulations/awgn/Makefile b/simulations/awgn/Makefile
similarity index 82%
rename from utils/simulations/awgn/Makefile
rename to simulations/awgn/Makefile
index e58f3c6..b189403 100644
--- a/utils/simulations/awgn/Makefile
+++ b/simulations/awgn/Makefile
@@ -18,6 +18,7 @@ results/all.csv: $(PCAPFILES)
 %.pcap: sim.py
 	@echo $@
 	mkdir -p results
+	export GR_CONF_DEFAULT_MAX_MESSAGES=123
 	$(eval REPETITION=$(shell python -c "print \"$@\".split(\"_\")[1]"))
 	$(eval ENCODING=$(shell python -c "print \"$@\".split(\"_\")[2]"))
 	$(eval SNR=$(shell python -c "print \"$@\".split(\"_\")[3]"))
@@ -25,4 +26,5 @@ results/all.csv: $(PCAPFILES)
 	@echo ENCODING=$(ENCODING)
 	@echo SNR=$(SNR)
 	./sim.py --messages=$(MESSAGES) --encoding=$(ENCODING) --snr=$(SNR) --repetition=$(REPETITION)
+#gdb -ex run -ex quit --args python ./sim.py --messages=$(MESSAGES) --encoding=$(ENCODING) --snr=$(SNR) --repetition=$(REPETITION)
 
diff --git a/utils/simulations/awgn/parse.sh b/simulations/awgn/parse.sh
similarity index 100%
rename from utils/simulations/awgn/parse.sh
rename to simulations/awgn/parse.sh
diff --git a/utils/simulations/awgn/pdr.pdf b/simulations/awgn/pdr.pdf
similarity index 76%
rename from utils/simulations/awgn/pdr.pdf
rename to simulations/awgn/pdr.pdf
index 0827791..ce90045 100644
Binary files a/utils/simulations/awgn/pdr.pdf and b/simulations/awgn/pdr.pdf differ
diff --git a/utils/simulations/awgn/plot.py b/simulations/awgn/plot.py
similarity index 100%
rename from utils/simulations/awgn/plot.py
rename to simulations/awgn/plot.py
diff --git a/utils/simulations/awgn/sim.grc b/simulations/awgn/sim.grc
similarity index 86%
rename from utils/simulations/awgn/sim.grc
rename to simulations/awgn/sim.grc
index c1be222..f25a90d 100644
--- a/utils/simulations/awgn/sim.grc
+++ b/simulations/awgn/sim.grc
@@ -108,6 +108,112 @@
       <value>96000</value>
     </param>
   </block>
+  <block>
+    <key>analog_noise_source_x</key>
+    <param>
+      <key>amp</key>
+      <value>1</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>_coordinate</key>
+      <value>(916, 616)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>90</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>analog_noise_source_x_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>noise_type</key>
+      <value>analog.GR_GAUSSIAN</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>repetition</value>
+    </param>
+  </block>
+  <block>
+    <key>blocks_add_xx</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(904, 496)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>90</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>blocks_add_xx_0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+  </block>
   <block>
     <key>blocks_file_sink</key>
     <param>
@@ -136,7 +242,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(40, 365)</value>
+      <value>(256, 388)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -152,7 +258,7 @@
     </param>
     <param>
       <key>unbuffered</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
       <key>vlen</key>
@@ -183,7 +289,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(520, 568)</value>
+      <value>(688, 588)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -210,116 +316,6 @@
       <value>1</value>
     </param>
   </block>
-  <block>
-    <key>blocks_null_sink</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bus_conns</key>
-      <value>[[0,],]</value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(408, 424)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>blocks_null_sink_0</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-  </block>
-  <block>
-    <key>channels_channel_model</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>block_tags</key>
-      <value>False</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>epsilon</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>freq_offset</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(704, 543)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>channels_channel_model_0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>noise_voltage</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>seed</key>
-      <value>repetition</value>
-    </param>
-    <param>
-      <key>taps</key>
-      <value>1.0</value>
-    </param>
-  </block>
   <block>
     <key>parameter</key>
     <param>
@@ -337,7 +333,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1016, 14)</value>
+      <value>(792, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -396,7 +392,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(368, 543)</value>
+      <value>(512, 560)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -424,7 +420,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
   </block>
   <block>
-    <key>foo_periodic_msg_source</key>
+    <key>foo_random_periodic_msg_source</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -447,7 +443,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(288, 181)</value>
+      <value>(392, 200)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -455,15 +451,15 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>id</key>
-      <value>foo_periodic_msg_source_0</value>
+      <value>foo_random_periodic_msg_source_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
       <value>0</value>
     </param>
     <param>
-      <key>msg</key>
-      <value>pmt.intern("".join([chr(random.randint(0,255)) for x in (lambda: (random.seed(repetition) == None) and range(pdu_len-24))()]))</value>
+      <key>msg_len</key>
+      <value>pdu_len - 24</value>
     </param>
     <param>
       <key>minoutbuf</key>
@@ -475,12 +471,16 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>interval</key>
-      <value>interval</value>
+      <value>5</value>
     </param>
     <param>
       <key>quit</key>
       <value>True</value>
     </param>
+    <param>
+      <key>seed</key>
+      <value>repetition</value>
+    </param>
   </block>
   <block>
     <key>foo_wireshark_connector</key>
@@ -506,7 +506,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(248, 373)</value>
+      <value>(464, 396)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -530,7 +530,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
   </block>
   <block>
-    <key>ieee802_11_ofdm_mac</key>
+    <key>ieee802_11_mac</key>
     <param>
       <key>bss_mac</key>
       <value>[0xff, 0xff, 0xff, 0xff, 0xff, 0xff]</value>
@@ -557,7 +557,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(552, 216)</value>
+      <value>(720, 236)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -565,7 +565,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>id</key>
-      <value>ieee802_11_ofdm_mac_0</value>
+      <value>ieee802_11_mac_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -642,49 +642,6 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
       <value>import random</value>
     </param>
   </block>
-  <block>
-    <key>parameter</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value>message generation interval (in ms)</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(792, 21)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>interval</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>short_id</key>
-      <value></value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>intx</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>200</value>
-    </param>
-  </block>
   <block>
     <key>parameter</key>
     <param>
@@ -744,7 +701,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1032, 173)</value>
+      <value>(1048, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -760,7 +717,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>short_id</key>
-      <value></value>
+      <value>l</value>
     </param>
     <param>
       <key>type</key>
@@ -787,7 +744,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(216, 13)</value>
+      <value>(208, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -803,7 +760,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>short_id</key>
-      <value></value>
+      <value>r</value>
     </param>
     <param>
       <key>type</key>
@@ -877,7 +834,7 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(568, 376)</value>
+      <value>(720, 408)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -895,28 +852,42 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
       <key>minoutbuf</key>
       <value>0</value>
     </param>
+    <param>
+      <key>bandwidth</key>
+      <value>10e6</value>
+    </param>
     <param>
       <key>chan_est</key>
-      <value>0</value>
+      <value>ieee802_11.LS</value>
     </param>
     <param>
       <key>encoding</key>
       <value>encoding</value>
     </param>
+    <param>
+      <key>frequency</key>
+      <value>5.89e9</value>
+    </param>
     <param>
       <key>sensitivity</key>
       <value>0.56</value>
     </param>
   </block>
   <connection>
-    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>channels_channel_model_0</sink_block_id>
+    <source_block_id>analog_noise_source_x_0</source_block_id>
+    <sink_block_id>blocks_add_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>blocks_add_xx_0</source_block_id>
+    <sink_block_id>wifi_phy_hier_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>channels_channel_model_0</source_block_id>
-    <sink_block_id>wifi_phy_hier_0</sink_block_id>
+    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
+    <sink_block_id>blocks_add_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -927,14 +898,8 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>foo_periodic_msg_source_0</source_block_id>
-    <sink_block_id>foo_wireshark_connector_0</sink_block_id>
-    <source_key>out</source_key>
-    <sink_key>in</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>foo_periodic_msg_source_0</source_block_id>
-    <sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
+    <source_block_id>foo_random_periodic_msg_source_0</source_block_id>
+    <sink_block_id>ieee802_11_mac_0</sink_block_id>
     <source_key>out</source_key>
     <sink_key>app in</sink_key>
   </connection>
@@ -945,17 +910,11 @@ corresponds to BPSK 1/2, ..., 64-QAM 3/4</value>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
+    <source_block_id>ieee802_11_mac_0</source_block_id>
     <sink_block_id>wifi_phy_hier_0</sink_block_id>
     <source_key>phy out</source_key>
     <sink_key>mac_in</sink_key>
   </connection>
-  <connection>
-    <source_block_id>wifi_phy_hier_0</source_block_id>
-    <sink_block_id>blocks_null_sink_0</sink_block_id>
-    <source_key>1</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
     <sink_block_id>foo_wireshark_connector_0</sink_block_id>