diff -Naur ns-3.22/AUTHORS ns-3.23/AUTHORS
--- ns-3.22/AUTHORS	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/AUTHORS	2015-05-13 11:05:26.000000000 -0700
@@ -28,9 +28,11 @@
 Eugene Chemeritskiy (echemeritskiy@arccn.ru)
 Yufei Cheng (yfcheng@ittc.ku.edu)
 Andrey Churin (aachurin@gmail.com)
+Benjamin Cizdziel (ben.cizdziel@gmail.com)
 Salva Climent (jocliba@gmail.com)
 Luis Cortes (cortes@gatech.edu)
 Luca Costantino (luca.costantino@gmail.com)
+Matthieu Coudron (matthieu.coudron@lip6.fr)
 Alexander D'souza (moijes12@gmail.com)
 Sébastien Deronne (sebastien.deronne@gmail.com)
 Craig Dowell (craigdo@ee.washington.edu)
@@ -49,6 +51,7 @@
 Ashim Ghosh (ashim.atiit@gmail.com)
 Martin Giachino (martin.giachino@gmail.com,giachino@fing.edu.uy)
 Tom Goff (tgoff@tgoff.net)
+Mohit Goyal (mohit.bits@gmail.com)
 Juan C. Granda (jcgranda@uniovi.es)
 David Gross (gdavid.devel@gmail.com)
 Maja Grubišić (maja.grubisic@live.com)
@@ -57,6 +60,7 @@
 Bruno Haick (bghaick@hotmail.com)
 Frank Helbert (frank@ime.usp.br)
 Tom Henderson (tomhend@u.washington.edu)
+Christopher Hepner (hepner@hs-ulm.de)
 Budiarto Herman (budiarto.herman@magister.fi)
 Tom Hewer (tomhewer@mac.com)
 Kristian A. Hiorth (kristahi@ifi.uio.no)
@@ -82,6 +86,7 @@
 Emmanuelle Laprise (emmmanuelle.laprise@bluekazoo.ca)
 Kristijan Lenković (k.lenkovic@me.com)
 Daniel Lertpratchya (nikkipui@gmail.com)
+Brett Levasseur (brettl20@gmail.com)
 Björn Lichtblau (lichtbla@informatik.hu-berlin.de)
 Timo Lindhorst (tlnd@online.de)
 Erwan Livolant (erwan.livolant@inria.fr)
@@ -101,6 +106,7 @@
 Edvin Močibob (edvin.mocibob@gmail.com)
 Mike Moreton (mjvm_ns@hotmail.com)
 Michele Muccio (michelemuccio@virgilio.it)
+Esteban Municio (esteban.municio@urjc.es)
 Sidharth Nabar (snabar@uw.edu)
 Hemanth Narra (hemanth@ittc.ku.edu)
 Roman Naumann (naumann@informatik.hu-berlin.de)
diff -Naur ns-3.22/CHANGES.html ns-3.23/CHANGES.html
--- ns-3.22/CHANGES.html	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/CHANGES.html	2015-05-13 11:05:26.000000000 -0700
@@ -51,6 +51,39 @@
 us a note on ns-developers mailing list.</p>
 
 <hr>
+<h1>Changes from ns-3.22 to ns-3.23</h1>
+<h2>New API:</h2>
+<ul>
+  <li> The mobility module includes a GeographicPositions class used to
+convert geographic to cartesian coordinates, and to generate randomly
+distributed geographic coordinates.
+  </li>
+  <li>  The spectrum module includes new TvSpectrumTransmitter classes and helpers to create television transmitter(s) that transmit PSD spectrums customized by attributes such as modulation type, power, antenna type, channel frequency, etc.
+  </li>
+</ul>
+<h2>Changes to existing API:</h2>
+<ul>
+  <li> In LteSpectrumPhy, LtePhyTxEndCallback and the corresponding methods have been removed, since they were unused.
+  </li>
+  <li> In the DataRate class in the network module, CalculateTxTime has been declared deprecated.  CalculateBytesTxTime and CalculateBitsTxTime are to be used instead.  The return value is a Time, instead of a double.
+  </li>
+  <li> In the Wi-Fi InterferenceHelper, the interference event now takes the WifiTxVector as an input parameter, instead of the WifiMode.  A similar change was made to the WifiPhy::RxOkCallback signature.
+  </li>
+</ul>
+<h2>Changes to build system:</h2>
+<ul>
+  <li> None </li>
+</ul>
+<h2>Changed behavior:</h2>
+This section is for behavioral changes to the models that were not due to a bug fix.
+<ul>
+  <li> In Wi-Fi, HT stations (802.11n) now support two-level aggregation. The InterferenceHelper now distinguishes between the PLCP and regular payload reception, for higher fidelity modeling.  ACKs are now sent using legacy rates and preambles.  Acces points now establish BSSBasicRateSet for control frame transmissions.  PLCP header and PLCP payload reception have been decoupled to improve PHY layer modeling accuracy.  RTS/CTS with A-MPDU is now fully supported.  
+  </li>
+  <li> The mesh module was made more compliant to the IEEE 802.11s-2012 standard and packet traces are now parseable by Wireshark.  
+  </li>
+</ul>
+
+<hr>
 <h1>Changes from ns-3.21 to ns-3.22</h1>
 <h2>New API:</h2>
 <ul>
diff -Naur ns-3.22/doc/doxygen.conf ns-3.23/doc/doxygen.conf
--- ns-3.22/doc/doxygen.conf	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/doxygen.conf	2015-05-13 11:05:26.000000000 -0700
@@ -40,7 +40,7 @@
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "3-dev"
+PROJECT_NUMBER         = "3.23"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff -Naur ns-3.22/doc/manual/source/attributes.rst ns-3.23/doc/manual/source/attributes.rst
--- ns-3.22/doc/manual/source/attributes.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/manual/source/attributes.rst	2015-05-13 11:05:26.000000000 -0700
@@ -165,6 +165,7 @@
     {
       static TypeId tid = TypeId ("ns3::Node")
         .SetParent<Object> ()
+        .SetGroupName ("Network")
         .AddConstructor<Node> ()
         .AddAttribute ("DeviceList",
 	               "The list of devices associated to this Node.",
@@ -300,6 +301,7 @@
     {
       static TypeId tid = TypeId ("ns3::DropTailQueue")
         .SetParent<Queue> ()
+        .SetGroupName ("Network")
         .AddConstructor<DropTailQueue> ()
         .AddAttribute ("MaxPackets", 
                        "The maximum number of packets accepted by this DropTailQueue.",
diff -Naur ns-3.22/doc/manual/source/conf.py ns-3.23/doc/manual/source/conf.py
--- ns-3.22/doc/manual/source/conf.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/manual/source/conf.py	2015-05-13 11:05:26.000000000 -0700
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.22'
+version = 'ns-3.23'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.22'
+release = 'ns-3.23'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Naur ns-3.22/doc/manual/source/new-models.rst ns-3.23/doc/manual/source/new-models.rst
--- ns-3.22/doc/manual/source/new-models.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/manual/source/new-models.rst	2015-05-13 11:05:26.000000000 -0700
@@ -341,6 +341,7 @@
     {
       static TypeId tid = TypeId ("ns3::ErrorModel")
         .SetParent<Object> ()
+        .SetGroupName ("Network")
         ;
       return tid;
     }
@@ -359,6 +360,7 @@
     {
       static TypeId tid = TypeId ("ns3::RateErrorModel")
         .SetParent<ErrorModel> ()
+        .SetGroupName ("Network")
         .AddConstructor<RateErrorModel> ()
         ;
       return tid;
@@ -556,6 +558,7 @@
     {
       static TypeId tid = TypeId ("ns3::RateErrorModel")
         .SetParent<ErrorModel> ()
+        .SetGroupName ("Network")
         .AddConstructor<RateErrorModel> ()
       ...
 
diff -Naur ns-3.22/doc/manual/source/random-variables.rst ns-3.23/doc/manual/source/random-variables.rst
--- ns-3.22/doc/manual/source/random-variables.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/manual/source/random-variables.rst	2015-05-13 11:05:26.000000000 -0700
@@ -277,6 +277,7 @@
     { 
       static TypeId tid = TypeId ("ns3::RandomPropagationDelayModel")
         .SetParent<PropagationDelayModel> ()
+        .SetGroupName ("Propagation")
         .AddConstructor<RandomPropagationDelayModel> ()
         .AddAttribute ("Variable",
                        "The random variable which generates random delays (s).",
diff -Naur ns-3.22/doc/manual/source/test-framework.rst ns-3.23/doc/manual/source/test-framework.rst
--- ns-3.22/doc/manual/source/test-framework.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/manual/source/test-framework.rst	2015-05-13 11:05:26.000000000 -0700
@@ -4,7 +4,7 @@
 Testing framework
 -----------------
 
-ns-3 consists of a simulation core engine, a set of models, example programs, 
+|ns3| consists of a simulation core engine, a set of models, example programs, 
 and tests.  Over time, new contributors contribute models, tests, and 
 examples.  A Python test program ``test.py`` serves as the test
 execution manager; ``test.py`` can run test code and examples to
@@ -17,7 +17,7 @@
 BuildBots
 *********
 
-At the highest level of ns-3 testing are the buildbots (build robots).  
+At the highest level of |ns3| testing are the buildbots (build robots).  
 If you are unfamiliar with
 this system look at `<http://djmitche.github.com/buildbot/docs/0.7.11/>`_.  
 This is an open-source automated system that allows |ns3| to be rebuilt
@@ -120,6 +120,17 @@
     -e EXAMPLE, --example=EXAMPLE
                           specify a single example to run (no relative path is
                           needed)
+    -d, --duration        print the duration of each test suite and example
+    -e EXAMPLE, --example=EXAMPLE
+                          specify a single example to run (no relative path is
+                          needed)
+    -u, --update-data     If examples use reference data files, get them to re-
+                          generate them
+    -f FULLNESS, --fullness=FULLNESS
+                          choose the duration of tests to run: QUICK, EXTENSIVE,
+                          or TAKES_FOREVER, where EXTENSIVE includes QUICK and
+                          TAKES_FOREVER includes QUICK and EXTENSIVE (only QUICK
+                          tests are run by default)
     -g, --grind           run the test suites and examples using valgrind
     -k, --kinds           print the kinds of tests available
     -l, --list            print the list of known tests
@@ -307,7 +318,7 @@
 
   PASS: Example examples/udp/udp-echo
 
-You can specify the directory where ns-3 was built using the
+You can specify the directory where |ns3| was built using the
 ``--buildpath`` option as follows.
 
 ::
@@ -329,7 +340,7 @@
   PASS: Example examples/tutorial/first.py
 
 Because Python examples are not built, you do not need to specify the
-directory where ns-3 was built to run them.
+directory where |ns3| was built to run them.
 
 Normally when example programs are executed, they write a large amount of trace 
 file data.  This is normally saved to the base directory of the distribution 
@@ -399,7 +410,7 @@
   $ ./test.py --verbose
 
 All of these options can be mixed and matched.  For example, to run all of the 
-ns-3 core test suites under valgrind, in verbose mode, while generating an HTML
+|ns3| core test suites under valgrind, in verbose mode, while generating an HTML
 output file, one would do::
 
   $ ./test.py --verbose --grind --constrain=core --html=results.html 
@@ -417,14 +428,32 @@
 * Examples
 * Performance Tests
 
+Moreover, each test is further classified according to the expected time needed to
+run it. Tests are classified as:
+
+* QUICK 
+* EXTENSIVE
+* TAKES_FOREVER
+
+Note that specifying EXTENSIVE fullness will also run tests in QUICK category. 
+Specifying TAKES_FOREVER will run tests in EXTENSIVE and QUICK categories. 
+By default, only QUICK tests are ran.
+
+As a rule of thumb, tests that must be run to ensure |ns3| coherence should be
+QUICK (i.e., take a few seconds). Tests that could be skipped, but are nice to do
+can be EXTENSIVE; these are tests that typically need minutes. TAKES_FOREVER is
+left for tests that take a really long time, in the order of several minutes.
+The main classification goal is to be able to run the buildbots in a reasonable
+time, and still be able to perform more extensive tests when needed.
+
 BuildVerificationTests
 ++++++++++++++++++++++
 
 These are relatively simple tests that are built along with the distribution
 and are used to make sure that the build is pretty much working.  Our
 current unit tests live in the source files of the code they test and are
-built into the ns-3 modules; and so fit the description of BVTs.  BVTs live
-in the same source code that is built into the ns-3 code.  Our current tests
+built into the |ns3| modules; and so fit the description of BVTs.  BVTs live
+in the same source code that is built into the |ns3| code.  Our current tests
 are examples of this kind of test.
 
 Unit Tests
@@ -432,10 +461,10 @@
 
 Unit tests are more involved tests that go into detail to make sure that a
 piece of code works as advertised in isolation.  There is really no reason
-for this kind of test to be built into an ns-3 module.  It turns out, for
+for this kind of test to be built into an |ns3| module.  It turns out, for
 example, that the unit tests for the object name service are about the same
 size as the object name service code itself.  Unit tests are tests that
-check a single bit of functionality that are not built into the ns-3 code,
+check a single bit of functionality that are not built into the |ns3| code,
 but live in the same directory as the code it tests.  It is possible that
 these tests check integration of multiple implementation files in a module
 as well.  The file src/core/test/names-test-suite.cc is an example of this kind
@@ -451,11 +480,11 @@
 but they are typically overloaded examples.  We provide a new place 
 for this kind of test in the directory ``src/test``.  The file
 src/test/ns3tcp/ns3-interop-test-suite.cc is an example of this kind of
-test.  It uses NSC TCP to test the ns-3 TCP implementation.  Often there
+test.  It uses NSC TCP to test the |ns3| TCP implementation.  Often there
 will be test vectors required for this kind of test, and they are stored in
 the directory where the test lives.  For example,
 ns3tcp-interop-response-vectors.pcap is a file consisting of a number of TCP
-headers that are used as the expected responses of the ns-3 TCP under test
+headers that are used as the expected responses of the |ns3| TCP under test
 to a stimulus generated by the NSC TCP which is used as a ''known good''
 implementation.
 
@@ -492,7 +521,7 @@
 
    $ ./waf --configure --enable-examples --enable-tests
 
-Then, build ns-3, and after it is built, just run ``test.py``.  ``test.py -h``
+Then, build |ns3|, and after it is built, just run ``test.py``.  ``test.py -h``
 will show a number of configuration options that modify the behavior
 of test.py.
 
@@ -503,12 +532,19 @@
 Debugging Tests
 ***************
 
-The debugging of the test programs is best performed running the low-level test-runner program. The test-runner is the bridge from generic Python code to |ns3| code. It is written in C++ and uses the automatic test discovery process in the 
-|ns3| code to find and allow execution of all of the various tests.
-
-The main reason why ``test.py`` is not suitable for debugging is that it is not allowed for logging to be turned on using the ``NS_LOG`` environmental variable when test.py runs.  This limitation does not apply to the test-runner executable. Hence, if you want to see logging output from your tests, you have to run them using the test-runner directly.
+The debugging of the test programs is best performed running the low-level 
+test-runner program. The test-runner is the bridge from generic Python 
+code to |ns3| code. It is written in C++ and uses the automatic test 
+discovery process in the |ns3| code to find and allow execution of all 
+of the various tests.
+
+The main reason why ``test.py`` is not suitable for debugging is that it is 
+not allowed for logging to be turned on using the ``NS_LOG`` environmental 
+variable when test.py runs.  This limitation does not apply to the test-runner 
+executable. Hence, if you want to see logging output from your tests, you 
+have to run them using the test-runner directly.
 
-In order to execute the test-runner, you run it like any other ns-3 executable
+In order to execute the test-runner, you run it like any other |ns3| executable
 -- using ``waf``.  To get a list of available options, you can type::
 
   $ ./waf --run "test-runner --help"
@@ -761,7 +797,7 @@
   MyTestSuite::MyTestSuite ()
     : TestSuite ("my-test-suite-name", UNIT)
   {
-    AddTestCase (new MyTestCase);
+    AddTestCase (new MyTestCase, TestCase::QUICK);
   }
   
   MyTestSuite myTestSuite;
diff -Naur ns-3.22/doc/models/Makefile ns-3.23/doc/models/Makefile
--- ns-3.22/doc/models/Makefile	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/models/Makefile	2015-05-13 11:05:26.000000000 -0700
@@ -250,6 +250,9 @@
 	$(SRC)/spectrum/doc/spectrum-channel-phy-interface.png \
 	$(SRC)/spectrum/doc/spectrum-channel-phy-interface.pdf \
 	$(SRC)/spectrum/doc/spectrum-analyzer-example.eps \
+	$(SRC)/spectrum/doc/spectrum-tv-rand-geo-points.eps \
+	$(SRC)/spectrum/doc/spectrum-tv-8vsb.png \
+	$(SRC)/spectrum/doc/spectrum-tv-cofdm.png \
 	$(SRC)/lr-wpan/doc/lr-wpan-arch.dia \
 	$(SRC)/lr-wpan/doc/lr-wpan-data-example.dia \
 	$(SRC)/lr-wpan/doc/lr-wpan-primitives.dia \
@@ -335,6 +338,7 @@
 	$(FIGURES)/lte-strongest-cell-handover-algorithm.eps \
 	$(FIGURES)/auvmobility-classes.eps \
 	$(FIGURES)/spectrum-analyzer-example.eps \
+	$(FIGURES)/spectrum-tv-rand-geo-points.eps \
 	$(FIGURES)/lr-wpan-primitives.eps \
 	$(FIGURES)/lr-wpan-data-example.eps \
 	$(FIGURES)/lr-wpan-arch.eps \
@@ -390,6 +394,7 @@
 $(FIGURES)/helpers.pdf_width = 8cm
 $(FIGURES)/auvmobility-classes.pdf_width = 10cm
 $(FIGURES)/spectrum-analyzer-example.pdf_width = 15cm
+$(FIGURES)/spectrum-tv-rand-geo-points.pdf_width = 8cm
 $(FIGURES)/lr-wpan-primitives.pdf_width = 3in
 $(FIGURES)/lr-wpan-arch.pdf_width = 2in
 
diff -Naur ns-3.22/doc/models/source/conf.py ns-3.23/doc/models/source/conf.py
--- ns-3.22/doc/models/source/conf.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/models/source/conf.py	2015-05-13 11:05:26.000000000 -0700
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.22'
+version = 'ns-3.23'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.22'
+release = 'ns-3.23'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Naur ns-3.22/doc/tutorial/source/building-topologies.rst ns-3.23/doc/tutorial/source/building-topologies.rst
--- ns-3.22/doc/tutorial/source/building-topologies.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/tutorial/source/building-topologies.rst	2015-05-13 11:05:26.000000000 -0700
@@ -24,7 +24,7 @@
 this section.  The appearance and operation of these helpers should look 
 quite familiar to you.
 
-We provide an example script in our examples/tutorial} directory.  This script
+We provide an example script in our ``examples/tutorial`` directory.  This script
 builds on the ``first.cc`` script and adds a CSMA network to the 
 point-to-point simulation we've already considered.  Go ahead and open 
 ``examples/tutorial/second.cc`` in your favorite editor.  You will have already seen
@@ -524,7 +524,7 @@
 
   $ tcpdump -nn -tt -r second-0-0.pcap
 
-and see that the echoed packet arrives back at the source at 2.007602 seconds,
+and see that the echoed packet arrives back at the source at 2.017607 seconds,
 
 .. sourcecode:: text
 
@@ -884,7 +884,7 @@
 Next, we see an old friend.  We instantiate a ``PointToPointHelper`` and 
 set the associated default ``Attributes`` so that we create a five megabit 
 per second transmitter on devices created using the helper and a two millisecond 
-delay on channels created by the helper.  We then ``Intall`` the devices
+delay on channels created by the helper.  We then ``Install`` the devices
 on the nodes and the channel between them.
 
 ::
@@ -1261,7 +1261,7 @@
 packets in this trace.  We leave it as an exercise to completely parse the 
 trace dump.
 
-Now, look at the pcap file of the right side of the point-to-point link,
+Now, look at the pcap file of the left side of the point-to-point link,
 
 .. sourcecode:: bash
 
diff -Naur ns-3.22/doc/tutorial/source/conceptual-overview.rst ns-3.23/doc/tutorial/source/conceptual-overview.rst
--- ns-3.22/doc/tutorial/source/conceptual-overview.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/tutorial/source/conceptual-overview.rst	2015-05-13 11:05:26.000000000 -0700
@@ -92,7 +92,7 @@
 
 Net Device
 ++++++++++
-It used to be the case that if you wanted to connect a computers to a network,
+It used to be the case that if you wanted to connect a computer to a network,
 you had to buy a specific kind of network cable and a hardware device called
 (in PC terminology) a *peripheral card* that needed to be installed in
 your computer.  If the peripheral card implemented some networking function,
diff -Naur ns-3.22/doc/tutorial/source/conf.py ns-3.23/doc/tutorial/source/conf.py
--- ns-3.22/doc/tutorial/source/conf.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/tutorial/source/conf.py	2015-05-13 11:05:26.000000000 -0700
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.22'
+version = 'ns-3.23'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.22'
+release = 'ns-3.23'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Naur ns-3.22/doc/tutorial/source/data-collection.rst ns-3.23/doc/tutorial/source/data-collection.rst
--- ns-3.22/doc/tutorial/source/data-collection.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/tutorial/source/data-collection.rst	2015-05-13 11:05:26.000000000 -0700
@@ -321,6 +321,7 @@
   {
     static TypeId tid = TypeId ("ns3::Ipv6PacketProbe")
       .SetParent<Probe> ()
+      .SetGroupName ("Stats")
       .AddConstructor<Ipv6PacketProbe> ()
       .AddTraceSource ( "Output",
                         "The packet plus its IPv6 object and interface that serve as the output for this probe",
diff -Naur ns-3.22/doc/tutorial/source/getting-started.rst ns-3.23/doc/tutorial/source/getting-started.rst
--- ns-3.22/doc/tutorial/source/getting-started.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/tutorial/source/getting-started.rst	2015-05-13 11:11:44.000000000 -0700
@@ -96,15 +96,15 @@
   $ cd
   $ mkdir workspace
   $ cd workspace
-  $ wget http://www.nsnam.org/release/ns-allinone-3.22.tar.bz2
-  $ tar xjf ns-allinone-3.22.tar.bz2
+  $ wget http://www.nsnam.org/release/ns-allinone-3.23.tar.bz2
+  $ tar xjf ns-allinone-3.23.tar.bz2
 
-If you change into the directory ``ns-allinone-3.22`` you should see a
+If you change into the directory ``ns-allinone-3.23`` you should see a
 number of files::
 
   $ ls
-  bake      constants.py   ns-3.22               README
-  build.py  netanim-3.105  pybindgen-0.16.0.886  util.py
+  bake      constants.py   ns-3.23               README
+  build.py  netanim-3.106  pybindgen-0.17.0.886  util.py
 
 You are now ready to build the base |ns3| distribution.
 
@@ -163,10 +163,10 @@
 
 There are a few configuration targets available:
 
-1.  ``ns-3.22``:  the module corresponding to the release; it will download
+1.  ``ns-3.23``:  the module corresponding to the release; it will download
     components similar to the release tarball.
 2.  ``ns-3-dev``:  a similar module but using the development code tree
-3.  ``ns-allinone-3.22``:  the module that includes other optional features
+3.  ``ns-allinone-3.23``:  the module that includes other optional features
     such as click routing, openflow for |ns3|, and the Network Simulation
     Cradle
 4.  ``ns-3-allinone``:  similar to the released version of the allinone
@@ -184,7 +184,7 @@
 `"ns-3 Releases"
 <http://www.nsnam.org/releases>`_
 web page and clicking on the latest release link.  We'll proceed in
-this tutorial example with ``ns-3.22``.
+this tutorial example with ``ns-3.23``.
 
 We are now going to use the bake tool to pull down the various pieces of 
 |ns3| you will be using.  First, we'll say a word about running bake.
@@ -210,7 +210,7 @@
 
 Step into the workspace directory and type the following into your shell::
 
-  $ ./bake.py configure -e ns-3.22
+  $ ./bake.py configure -e ns-3.23
 
 Next, we'l ask bake to check whether we have enough tools to download
 various components.  Type::
@@ -256,17 +256,17 @@
    >> Searching for system dependency pygoocanvas - OK
    >> Searching for system dependency python-dev - OK
    >> Searching for system dependency pygraphviz - OK
-   >> Downloading pybindgen-0.16.0.886 - OK
+   >> Downloading pybindgen-0.17.0.886 - OK
    >> Searching for system dependency g++ - OK
    >> Searching for system dependency qt4 - OK
-   >> Downloading netanim-3.105 - OK
-   >> Downloading ns-3.22 - OK    
+   >> Downloading netanim-3.106 - OK
+   >> Downloading ns-3.23 - OK    
 
 The above suggests that three sources have been downloaded.  Check the
 ``source`` directory now and type ``ls``; one should see::
 
   $ ls
-  netanim-3.105  ns-3.22  pybindgen-0.16.0.886
+  netanim-3.106  ns-3.23  pybindgen-0.17.0.886
 
 You are now ready to build the |ns3| distribution.
 
@@ -285,7 +285,7 @@
 
 If you downloaded
 using a tarball you should have a directory called something like 
-``ns-allinone-3.22`` under your ``~/workspace`` directory.  
+``ns-allinone-3.23`` under your ``~/workspace`` directory.  
 Type the following::
 
   $ ./build.py --enable-examples --enable-tests
@@ -301,7 +301,7 @@
 script builds the various pieces you downloaded.  Eventually you should see the
 following::
 
-   Waf: Leaving directory `/path/to/workspace/ns-allinone-3.22/ns-3.22/build'
+   Waf: Leaving directory `/path/to/workspace/ns-allinone-3.23/ns-3.23/build'
    'build' finished successfully (6m25.032s)
   
    Modules built:
@@ -323,7 +323,7 @@
    brite                     click                     openflow                 
    visualizer               
 
-   Leaving directory `./ns-3.22'
+   Leaving directory `./ns-3.23'
 
 Regarding the portion about modules not built::
 
@@ -349,9 +349,9 @@
 
 and you should see something like::
 
-  >> Building pybindgen-0.16.0.886 - OK
-  >> Building netanim-3.105 - OK
-  >> Building ns-3.22 - OK
+  >> Building pybindgen-0.17.0.886 - OK
+  >> Building netanim-3.106 - OK
+  >> Building ns-3.23 - OK
 
 *Hint:  you can also perform both steps, download and build by calling 'bake.py deploy'.*
 
@@ -664,7 +664,7 @@
 
   $ ../../../waf ...
 
-but that get's tedious, and error prone, and there are better solutions.
+but that gets tedious, and error prone, and there are better solutions.
 
 If you have the full |ns3| repository this little gem is a start::
 
@@ -848,7 +848,7 @@
 Working Directory
 +++++++++++++++++
 
-Waf needs to run from it's location at the top of the |ns3| tree.
+Waf needs to run from its location at the top of the |ns3| tree.
 This becomes the working directory where output files will be written.
 But what if you want to keep those ouf to the |ns3| source tree?  Use
 the ``--cwd`` argument::
diff -Naur ns-3.22/doc/tutorial/source/tracing.rst ns-3.23/doc/tutorial/source/tracing.rst
--- ns-3.22/doc/tutorial/source/tracing.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/tutorial/source/tracing.rst	2015-05-13 11:05:26.000000000 -0700
@@ -365,6 +365,7 @@
     {
       static TypeId tid = TypeId ("MyObject")
         .SetParent (Object::GetTypeId ())
+        .SetGroupName ("MyGroup")
         .AddConstructor<MyObject> ()
         .AddTraceSource ("MyInteger",
                          "An integer value to trace.",
diff -Naur ns-3.22/doc/tutorial/source/tweaking.rst ns-3.23/doc/tutorial/source/tweaking.rst
--- ns-3.22/doc/tutorial/source/tweaking.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/tutorial/source/tweaking.rst	2015-05-13 11:05:26.000000000 -0700
@@ -632,6 +632,46 @@
     --ns3::PointToPointChannel::Delay=2ms 
     --ns3::UdpEchoClient::MaxPackets=2"
 
+A natural question to arise at this point is how to learn about the existence
+of all of these attributes.  Again, the command line help facility has
+a feature for this.  If we ask for command line help we should see:
+
+.. sourcecode:: bash
+
+  $ ./waf --run "scratch/myfirst --PrintHelp"
+  myfirst [Program Arguments] [General Arguments]
+
+  General Arguments:
+    --PrintGlobals:              Print the list of globals.
+    --PrintGroups:               Print the list of groups.
+    --PrintGroup=[group]:        Print all TypeIds of group.
+    --PrintTypeIds:              Print all TypeIds.
+    --PrintAttributes=[typeid]:  Print all attributes of typeid.
+    --PrintHelp:                 Print this help message.
+
+If you select the "PrintGroups" argument, you should see a list of all
+registered TypeId groups.  The group names are aligned with the module names
+in the source directory (although with a leading capital letter).  Printing 
+out all of the information at once would be too much, so a further filter 
+is available to print information on a per-group basis.   So, focusing
+again on the point-to-point module:
+
+.. sourcecode:: bash
+
+  ./waf --run "scratch/myfirst --PrintGroup=PointToPoint"
+  TypeIds in group PointToPoint:
+    ns3::PointToPointChannel
+    ns3::PointToPointNetDevice
+    ns3::PointToPointRemoteChannel
+    ns3::PppHeader
+
+and from here, one can find the possible TypeId names to search for
+attributes, such as in the ``--PrintAttributes=ns3::PointToPointChannel``
+example shown above.
+
+Another way to find out about attributes is through the ns-3 Doxygen; there
+is a page that lists out all of the registered attributes in the simulator.
+
 Hooking Your Own Values
 +++++++++++++++++++++++
 You can also add your own hooks to the command line system.  This is done
diff -Naur ns-3.22/doc/tutorial-pt-br/source/conf.py ns-3.23/doc/tutorial-pt-br/source/conf.py
--- ns-3.22/doc/tutorial-pt-br/source/conf.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/doc/tutorial-pt-br/source/conf.py	2015-05-13 11:05:26.000000000 -0700
@@ -50,9 +50,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'ns-3.22'
+version = 'ns-3.23'
 # The full version, including alpha/beta/rc tags.
-release = 'ns-3.22'
+release = 'ns-3.23'
 
 # The language for content autogenerated by . Refer to babel documentation
 # for a list of supported languages.
diff -Naur ns-3.22/examples/wireless/ht-wifi-network.cc ns-3.23/examples/wireless/ht-wifi-network.cc
--- ns-3.22/examples/wireless/ht-wifi-network.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/examples/wireless/ht-wifi-network.cc	2015-05-13 11:05:27.000000000 -0700
@@ -54,7 +54,7 @@
   cmd.Parse (argc,argv);
 
   std::cout << "DataRate" << "\t" << "Throughput" << '\n';
-  for (int mcs = 0; mcs <= 31; mcs++)
+  for (int i = 0; i <= 31; i++)
     {
       uint32_t payloadSize; //1500 byte IP packet
       if (udp)
@@ -76,17 +76,17 @@
       YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
       phy.SetChannel (channel.Create ());
 
-      if (mcs <= 7)
+      if (i <= 7)
         {
           phy.Set ("ShortGuardEnabled", BooleanValue (false));
           phy.Set ("ChannelBonding", BooleanValue (false));
         }
-      else if (mcs > 7 && mcs <= 15)
+      else if (i > 7 && i <= 15)
         {
           phy.Set ("ShortGuardEnabled", BooleanValue (true));
           phy.Set ("ChannelBonding", BooleanValue (false));
         }
-      else if (mcs > 15 && mcs <= 23)
+      else if (i > 15 && i <= 23)
         {
           phy.Set ("ShortGuardEnabled", BooleanValue (false));
           phy.Set ("ChannelBonding", BooleanValue (true));
@@ -105,157 +105,157 @@
 
       double datarate = 0;
       StringValue DataRate;
-      if (mcs == 0)
+      if (i == 0)
         {
           DataRate = StringValue ("OfdmRate6_5MbpsBW20MHz");
           datarate = 6.5;
         }
-      else if (mcs == 1)
+      else if (i == 1)
         {
           DataRate = StringValue ("OfdmRate13MbpsBW20MHz");
           datarate = 13;
         }
-      else if (mcs == 2)
+      else if (i == 2)
         {
           DataRate = StringValue ("OfdmRate19_5MbpsBW20MHz");
           datarate = 19.5;
         }
-      else if (mcs == 3)
+      else if (i == 3)
         {
           DataRate = StringValue ("OfdmRate26MbpsBW20MHz");
           datarate = 26;
         }
-      else if (mcs == 4)
+      else if (i == 4)
         {
           DataRate = StringValue ("OfdmRate39MbpsBW20MHz");
           datarate = 39;
         }
-      else if (mcs == 5)
+      else if (i == 5)
         {
           DataRate = StringValue ("OfdmRate52MbpsBW20MHz");
           datarate = 52;
         }
-      else if (mcs == 6)
+      else if (i == 6)
         {
           DataRate = StringValue ("OfdmRate58_5MbpsBW20MHz");
           datarate = 58.5;
         }
-      else if (mcs == 7)
+      else if (i == 7)
         {
           DataRate = StringValue ("OfdmRate65MbpsBW20MHz");
           datarate = 65;
         }
-      else if (mcs == 8)
+      else if (i == 8)
         {
           DataRate = StringValue ("OfdmRate7_2MbpsBW20MHz");
           datarate = 7.2;
         }
-      else if (mcs == 9)
+      else if (i == 9)
         {
           DataRate = StringValue ("OfdmRate14_4MbpsBW20MHz");
           datarate = 14.4;
         }
-      else if (mcs == 10)
+      else if (i == 10)
         {
           DataRate = StringValue ("OfdmRate21_7MbpsBW20MHz");
           datarate = 21.7;
         }
-      else if (mcs == 11)
+      else if (i == 11)
         {
           DataRate = StringValue ("OfdmRate28_9MbpsBW20MHz");
           datarate = 28.9;
         }
-      else if (mcs == 12)
+      else if (i == 12)
         {
           DataRate = StringValue ("OfdmRate43_3MbpsBW20MHz");
           datarate = 43.3;
         }
-      else if (mcs == 13)
+      else if (i == 13)
         {
           DataRate = StringValue ("OfdmRate57_8MbpsBW20MHz");
           datarate = 57.8;
         }
-      else if (mcs == 14)
+      else if (i == 14)
         {
           DataRate = StringValue ("OfdmRate65MbpsBW20MHzShGi");
           datarate = 65;
         }
-      else if (mcs == 15)
+      else if (i == 15)
         {
           DataRate = StringValue ("OfdmRate72_2MbpsBW20MHz");
           datarate = 72.2;
         }
-      else if (mcs == 16)
+      else if (i == 16)
         {
           DataRate = StringValue ("OfdmRate13_5MbpsBW40MHz");
           datarate = 13.5;
         }
-      else if (mcs == 17)
+      else if (i == 17)
         {
           DataRate = StringValue ("OfdmRate27MbpsBW40MHz");
           datarate = 27;
         }
-      else if (mcs == 18)
+      else if (i == 18)
         {
           DataRate = StringValue ("OfdmRate40_5MbpsBW40MHz");
           datarate = 40.5;
         }
-      else if (mcs == 19)
+      else if (i == 19)
         {
           DataRate = StringValue ("OfdmRate54MbpsBW40MHz");
           datarate = 54;
         }
-      else if (mcs == 20)
+      else if (i == 20)
         {
           DataRate = StringValue ("OfdmRate81MbpsBW40MHz");
           datarate = 81;
         }
-      else if (mcs == 21)
+      else if (i == 21)
         {
           DataRate = StringValue ("OfdmRate108MbpsBW40MHz");
           datarate = 108;
         }
-      else if (mcs == 22)
+      else if (i == 22)
         {
           DataRate = StringValue ("OfdmRate121_5MbpsBW40MHz");
           datarate = 121.5;
         }
-      else if (mcs == 23)
+      else if (i == 23)
         {
           DataRate = StringValue ("OfdmRate135MbpsBW40MHz");
           datarate = 135;
         }
-      else if (mcs == 24)
+      else if (i == 24)
         {
           DataRate = StringValue ("OfdmRate15MbpsBW40MHz");
           datarate = 15;
         }
-      else if (mcs == 25)
+      else if (i == 25)
         {
           DataRate = StringValue ("OfdmRate30MbpsBW40MHz");
           datarate = 30;
         }
-      else if (mcs == 26)
+      else if (i == 26)
         {
           DataRate = StringValue ("OfdmRate45MbpsBW40MHz");
           datarate = 45;
         }
-      else if (mcs == 27)
+      else if (i == 27)
         {
           DataRate = StringValue ("OfdmRate60MbpsBW40MHz");
           datarate = 60;
         }
-      else if (mcs == 28)
+      else if (i == 28)
         {
           DataRate = StringValue ("OfdmRate90MbpsBW40MHz");
           datarate = 90;
         }
-      else if (mcs == 29)
+      else if (i == 29)
         {
           DataRate = StringValue ("OfdmRate120MbpsBW40MHz");
           datarate = 120;
         }
-      else if (mcs == 30)
+      else if (i == 30)
         {
           DataRate = StringValue ("OfdmRate135MbpsBW40MHzShGi");
           datarate = 135;
diff -Naur ns-3.22/examples/wireless/simple-ht-hidden-stations.cc ns-3.23/examples/wireless/simple-ht-hidden-stations.cc
--- ns-3.22/examples/wireless/simple-ht-hidden-stations.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/examples/wireless/simple-ht-hidden-stations.cc	2015-05-13 11:05:27.000000000 -0700
@@ -0,0 +1,179 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2015 Sébastien Deronne
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
+ */
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/wifi-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/internet-module.h"
+
+// This example considers two hidden stations in an 802.11n network which supports MPDU aggregation.
+// The user can specify whether RTS/CTS is used and can set the number of aggregated MPDUs.
+//
+// Example: ./waf --run "simple-ht-hidden-stations --enableRts=1 --nMpdus=8"
+//
+// Network topology:
+//
+//   Wifi 192.168.1.0
+//
+//        AP
+//   *    *    *
+//   |    |    |
+//   n1   n2   n3
+//
+// Packets in this simulation aren't marked with a QosTag so they are considered
+// belonging to BestEffort Access Class (AC_BE).
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("SimplesHtHiddenStations");
+
+int main (int argc, char *argv[])
+{
+  uint32_t payloadSize = 1472; //bytes
+  uint64_t simulationTime = 10; //seconds
+  uint32_t nMpdus = 1;
+  bool enableRts = 0;
+    
+  CommandLine cmd;
+  cmd.AddValue("nMpdus", "Number of aggregated MPDUs", nMpdus);
+  cmd.AddValue("payloadSize", "Payload size in bytes", payloadSize);
+  cmd.AddValue("enableRts", "Enable RTS/CTS", enableRts); // 1: RTS/CTS enabled; 0: RTS/CTS disabled
+  cmd.AddValue("simulationTime", "Simulation time in seconds", simulationTime);
+  cmd.Parse (argc, argv);
+    
+  if(!enableRts)
+    Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("999999"));
+  else
+    Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("0"));
+     
+  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("990000"));
+  
+  // Set the maximum wireless range to 5 meters in order to reproduce a hidden nodes scenario, i.e. the distance between hidden stations is larger than 5 meters
+  Config::SetDefault ("ns3::RangePropagationLossModel::MaxRange", DoubleValue (5));
+
+  NodeContainer wifiStaNodes;
+  wifiStaNodes.Create (2);
+  NodeContainer wifiApNode;
+  wifiApNode.Create(1);
+
+  YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
+  channel.AddPropagationLoss ("ns3::RangePropagationLossModel"); //wireless range limited to 5 meters!
+
+  YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
+  phy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
+  phy.SetChannel (channel.Create());
+
+  WifiHelper wifi = WifiHelper::Default ();
+  wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue("OfdmRate65MbpsBW20MHz"), "ControlMode", StringValue("OfdmRate6_5MbpsBW20MHz"));
+  HtWifiMacHelper mac = HtWifiMacHelper::Default ();
+
+  Ssid ssid = Ssid ("simple-mpdu-aggregation");
+  mac.SetType ("ns3::StaWifiMac",
+               "Ssid", SsidValue (ssid),
+               "ActiveProbing", BooleanValue (false));
+
+  if (nMpdus > 1) mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable Block ACK when A-MPDU is enabled
+
+  mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
+                              "MaxAmpduSize", UintegerValue (nMpdus*(payloadSize+100))); //enable MPDU aggregation for AC_BE with a maximum aggregated size of nMpdus*(payloadSize+100) bytes,
+                                                                                         //i.e. nMpdus aggregated packets in an A-MPDU
+  
+  NetDeviceContainer staDevices;
+  staDevices = wifi.Install (phy, mac, wifiStaNodes);
+
+  mac.SetType ("ns3::ApWifiMac",
+               "Ssid", SsidValue (ssid),
+               "BeaconInterval", TimeValue (MicroSeconds(102400)),
+               "BeaconGeneration", BooleanValue (true));
+
+  if (nMpdus > 1) mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable Block ACK when A-MPDU is enabled
+    
+  mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
+                              "MaxAmpduSize", UintegerValue (nMpdus*(payloadSize+100))); //enable MPDU aggregation for AC_BE with a maximum aggregated size of nMpdus*(payloadSize+100) bytes,
+                                                                                         //i.e. nMpdus aggregated packets in an A-MPDU
+
+  NetDeviceContainer apDevice;
+  apDevice = wifi.Install (phy, mac, wifiApNode);
+
+  // Setting mobility model
+  MobilityHelper mobility;
+  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
+
+  // AP is between the two stations, each station being located at 5 meters from the AP.
+  // The distance between the two stations is thus equal to 10 meters.
+  // Since the wireless range is limited to 5 meters, the two stations are hidden from each other.
+  positionAlloc->Add (Vector (5.0, 0.0, 0.0));
+  positionAlloc->Add (Vector (0.0, 0.0, 0.0));
+  positionAlloc->Add (Vector (10.0, 0.0, 0.0));
+  mobility.SetPositionAllocator (positionAlloc);
+
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+
+  mobility.Install (wifiApNode);
+  mobility.Install (wifiStaNodes);
+
+  // Internet stack
+  InternetStackHelper stack;
+  stack.Install (wifiApNode);
+  stack.Install (wifiStaNodes);
+
+  Ipv4AddressHelper address;
+
+  address.SetBase ("192.168.1.0", "255.255.255.0");
+  Ipv4InterfaceContainer StaInterface;
+  StaInterface = address.Assign (staDevices);
+  Ipv4InterfaceContainer ApInterface;
+  ApInterface = address.Assign (apDevice);
+ 
+  // Setting applications
+  UdpServerHelper myServer (9);
+  ApplicationContainer serverApp = myServer.Install (wifiApNode);
+  serverApp.Start (Seconds (0.0));
+  serverApp.Stop (Seconds (simulationTime+1));
+      
+  UdpClientHelper myClient (ApInterface.GetAddress (0), 9);
+  myClient.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
+  myClient.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
+  myClient.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+  
+  // Saturated UDP traffic from stations to AP
+  ApplicationContainer clientApp1 = myClient.Install (wifiStaNodes);
+  clientApp1.Start (Seconds (1.0));
+  clientApp1.Stop (Seconds (simulationTime+1));
+  
+  phy.EnablePcap ("SimpleHtHiddenStations_Ap", apDevice.Get (0));
+  phy.EnablePcap ("SimpleHtHiddenStations_Sta1", staDevices.Get (0));
+  phy.EnablePcap ("SimpleHtHiddenStations_Sta2", staDevices.Get (1));
+      
+  Simulator::Stop (Seconds (simulationTime+1));
+
+  Simulator::Run ();
+  Simulator::Destroy ();
+      
+  uint32_t totalPacketsThrough = DynamicCast<UdpServer>(serverApp.Get (0))->GetReceived ();
+  double throughput = totalPacketsThrough*payloadSize*8/(simulationTime*1000000.0);
+  std::cout << "Throughput: " << throughput << " Mbit/s" << '\n';
+    
+  return 0;
+}
diff -Naur ns-3.22/examples/wireless/simple-two-level-aggregation.cc ns-3.23/examples/wireless/simple-two-level-aggregation.cc
--- ns-3.22/examples/wireless/simple-two-level-aggregation.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/examples/wireless/simple-two-level-aggregation.cc	2015-05-13 11:05:27.000000000 -0700
@@ -0,0 +1,214 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2015 Sébastien Deronne
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
+ */
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/applications-module.h"
+#include "ns3/wifi-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/internet-module.h"
+
+// This is a simple example in order to show how 802.11n two-level aggregation feature works.
+// Two-level aggregation is the simultaneous use of MSDU and MPDU aggregation schemes (known as one-level aggregation techniques).
+//
+// The throughput is obtained for a given number of aggregated MSDUs and MPDUs.
+// The number of aggregated MSDUs and MPDUs can be chosen by the user through the nMsdus and nMpdus attibutes, respectively.
+//
+// Example: ./waf --run "simple-two-level-aggregation --nMsdus=3 --nMpdus=8"
+//
+// Network topology:
+//
+//   Wifi 192.168.1.0
+//
+//        AP
+//   *    *
+//   |    |
+//   n1   n2
+//
+// Packets in this simulation aren't marked with a QosTag so they are considered
+// belonging to BestEffort Access Class (AC_BE).
+//
+// Throughput gets higher as either nMsdus or nMpdus is increased (one-level aggregation),
+// or when both nMsdus and nMpdus are increases (two-level aggregation).
+// MSDU aggregation offers a better header reduction compare to MPDU aggregation,
+// while MPDU aggregation is more robust against transmission errors than MSDU aggregation.
+// The good setting of nMsdu and nMpdus will depends on various factors (payload size, channel conditions, ...).
+// Since this example considers an ideal channel, the highest throughput is obtained with the largest values for nMsdus and nMpdus parameters.
+// Users should nevertheless take care that the standard rules limit the maximum MSDU size to 7935 bytes and the MPDU size to 65535 bytes.
+// Consequently, more packets should be aggregated if their payload is small with standard-compliant parameters.
+// Users should also note that the maximum duration of the frame is limited by the standard.
+// As a result, higher values for nMsdus and nMpdus may not always provide throughput improvements.
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("SimpleTwoLevelAggregation");
+
+int main (int argc, char *argv[])
+{
+  uint32_t payloadSize = 1472; //bytes
+  uint64_t simulationTime = 10; //seconds
+  uint32_t nMsdus = 1;
+  uint32_t nMpdus = 1;
+  bool enableRts = 0;
+
+  CommandLine cmd;
+  cmd.AddValue ("nMsdus", "Number of aggregated MSDUs", nMsdus); //number of aggregated MSDUs specified by the user
+  cmd.AddValue ("nMpdus", "Number of aggregated MPDUs", nMpdus); //number of aggregated MPDUs specified by the user
+  cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
+  cmd.AddValue ("enableRts", "Enable RTS/CTS", enableRts);
+  cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
+  cmd.Parse (argc, argv);
+
+  if (!enableRts)
+    {
+      Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("999999"));
+    }
+  else
+    {
+      Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("0"));
+    }
+
+  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("990000"));
+
+  NodeContainer wifiStaNode;
+  wifiStaNode.Create (1);
+  NodeContainer wifiApNode;
+  wifiApNode.Create (1);
+
+  YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
+  YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
+  phy.SetPcapDataLinkType (YansWifiPhyHelper::DLT_IEEE802_11_RADIO);
+  phy.SetChannel (channel.Create ());
+
+  WifiHelper wifi = WifiHelper::Default ();
+  wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
+  //We consider a constant bitrate since HT rate adaptation algorithms are not supported yet in the simulator
+  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
+                                "DataMode", StringValue ("OfdmRate65MbpsBW20MHz"),
+                                "ControlMode", StringValue ("OfdmRate6_5MbpsBW20MHz"));
+  HtWifiMacHelper mac = HtWifiMacHelper::Default ();
+
+  Ssid ssid = Ssid ("simple-two-level-aggregation");
+  mac.SetType ("ns3::StaWifiMac",
+               "Ssid", SsidValue (ssid),
+               "ActiveProbing", BooleanValue (false));
+
+
+  //Enable aggregation at the station side
+  if (nMpdus > 1)
+    {
+      mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable BlockAck when A-MPDU is used
+    }
+  if (nMsdus > 0)
+    {
+      mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
+                                  "MaxAmpduSize", UintegerValue (nMpdus * (nMsdus * (payloadSize + 100)))); //Set the maximum size for A-MPDU with regards to the payload size and the number of MSDUs expected in each MPDU.
+    }
+  else //MPDU aggregation only (one-level aggregation)
+    {
+      mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
+                                  "MaxAmpduSize", UintegerValue (nMpdus * (payloadSize + 200))); //Set the maximum size for A-MPDU with regards to the payload size
+    }
+  mac.SetMsduAggregatorForAc (AC_BE,"ns3::MsduStandardAggregator",
+                              "MaxAmsduSize", UintegerValue (nMsdus * (payloadSize + 100))); //Set the maximum size for A-MSDU with regards to the payload size
+
+
+  NetDeviceContainer staDevice;
+  staDevice = wifi.Install (phy, mac, wifiStaNode);
+
+  mac.SetType ("ns3::ApWifiMac",
+               "Ssid", SsidValue (ssid),
+               "BeaconInterval", TimeValue (MicroSeconds (102400)),
+               "BeaconGeneration", BooleanValue (true));
+
+  //Enable aggregation at the AP side
+  if (nMpdus > 1)
+    {
+      mac.SetBlockAckThresholdForAc (AC_BE, 2); //enable BlockAck when A-MPDU is used
+    }
+  if (nMsdus > 0)
+    {
+      mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
+                                  "MaxAmpduSize", UintegerValue (nMpdus * (nMsdus * (payloadSize + 100)))); //Set the maximum size for A-MPDU according to the payload size and the number of MSDUs expected in each MPDU.
+    }
+  else //MPDU aggregation only (one-level aggregation)
+    {
+      mac.SetMpduAggregatorForAc (AC_BE,"ns3::MpduStandardAggregator",
+                                  "MaxAmpduSize", UintegerValue (nMpdus * (payloadSize + 200))); //Set the maximum size for A-MPDU with regards to the payload size
+    }
+  mac.SetMsduAggregatorForAc (AC_BE,"ns3::MsduStandardAggregator",
+                              "MaxAmsduSize", UintegerValue (nMsdus * (payloadSize + 100))); //Set the maximum size for A-MSDU with regards to the payload size
+
+  NetDeviceContainer apDevice;
+  apDevice = wifi.Install (phy, mac, wifiApNode);
+
+  /* Setting mobility model */
+  MobilityHelper mobility;
+  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
+
+  positionAlloc->Add (Vector (0.0, 0.0, 0.0));
+  positionAlloc->Add (Vector (1.0, 0.0, 0.0));
+  mobility.SetPositionAllocator (positionAlloc);
+
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+
+  mobility.Install (wifiApNode);
+  mobility.Install (wifiStaNode);
+
+  /* Internet stack*/
+  InternetStackHelper stack;
+  stack.Install (wifiApNode);
+  stack.Install (wifiStaNode);
+
+  Ipv4AddressHelper address;
+
+  address.SetBase ("192.168.1.0", "255.255.255.0");
+  Ipv4InterfaceContainer StaInterface;
+  StaInterface = address.Assign (staDevice);
+  Ipv4InterfaceContainer ApInterface;
+  ApInterface = address.Assign (apDevice);
+
+  /* Setting applications */
+  UdpServerHelper myServer (9);
+  ApplicationContainer serverApp = myServer.Install (wifiStaNode.Get (0));
+  serverApp.Start (Seconds (0.0));
+  serverApp.Stop (Seconds (simulationTime + 1));
+
+  UdpClientHelper myClient (StaInterface.GetAddress (0), 9);
+  myClient.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
+  myClient.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
+  myClient.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+
+  ApplicationContainer clientApp = myClient.Install (wifiApNode.Get (0));
+  clientApp.Start (Seconds (1.0));
+  clientApp.Stop (Seconds (simulationTime + 1));
+
+  Simulator::Stop (Seconds (simulationTime + 1));
+
+  Simulator::Run ();
+  Simulator::Destroy ();
+
+  uint32_t totalPacketsThrough = DynamicCast<UdpServer> (serverApp.Get (0))->GetReceived ();
+  double throughput = totalPacketsThrough * payloadSize * 8 / (simulationTime * 1000000.0);
+  std::cout << "Throughput: " << throughput << " Mbit/s" << '\n';
+
+  return 0;
+}
diff -Naur ns-3.22/examples/wireless/wifi-wired-bridging.cc ns-3.23/examples/wireless/wifi-wired-bridging.cc
--- ns-3.22/examples/wireless/wifi-wired-bridging.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/examples/wireless/wifi-wired-bridging.cc	2015-05-13 11:05:27.000000000 -0700
@@ -24,7 +24,7 @@
 //      +-----+      +-----+            +-----+      +-----+
 //      | STA |      | STA |            | STA |      | STA | 
 //      +-----+      +-----+            +-----+      +-----+
-//    192.168.0.3  192.168.0.4        192.168.0.5  192.168.0.6
+//    192.168.0.2  192.168.0.3        192.168.0.5  192.168.0.6
 //      --------     --------           --------     --------
 //      WIFI STA     WIFI STA           WIFI STA     WIFI STA
 //      --------     --------           --------     --------
@@ -37,7 +37,7 @@
 //             ##############           ##############
 //                 BRIDGE                   BRIDGE
 //             ##############           ############## 
-//               192.168.0.1              192.168.0.2
+//               192.168.0.1              192.168.0.4
 //               +---------+              +---------+
 //               | AP Node |              | AP Node |
 //               +---------+              +---------+
diff -Naur ns-3.22/examples/wireless/wscript ns-3.23/examples/wireless/wscript
--- ns-3.22/examples/wireless/wscript	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/examples/wireless/wscript	2015-05-13 11:05:27.000000000 -0700
@@ -71,4 +71,10 @@
     obj.source = 'rate-adaptation-distance.cc'
 
     obj = bld.create_ns3_program('simple-mpdu-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
-    obj.source = 'simple-mpdu-aggregation.cc'
\ No newline at end of file
+    obj.source = 'simple-mpdu-aggregation.cc'
+
+    obj = bld.create_ns3_program('simple-two-level-aggregation', ['internet', 'mobility', 'wifi', 'applications'])
+    obj.source = 'simple-two-level-aggregation.cc'
+
+    obj = bld.create_ns3_program('simple-ht-hidden-stations', ['internet', 'mobility', 'wifi', 'applications'])    
+    obj.source = 'simple-ht-hidden-stations.cc'
diff -Naur ns-3.22/RELEASE_NOTES ns-3.23/RELEASE_NOTES
--- ns-3.22/RELEASE_NOTES	2015-02-05 16:17:45.000000000 -0800
+++ ns-3.23/RELEASE_NOTES	2015-05-13 11:05:26.000000000 -0700
@@ -9,6 +9,72 @@
 Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
+Release 3.23
+============
+
+Availability
+------------
+This release is available from:
+http://www.nsnam.org/release/ns-allinone-3.23.tar.bz2
+
+Supported platforms
+-------------------
+This release has been tested on the following platforms:
+- Ubuntu 15.04 (64 bit) with g++-4.9.2
+- Fedora Core 21 (64 bit) with g++-4.9.2
+- Ubuntu 14.04 (64 bit) with g++-4.8.2
+- Ubuntu 12.04.4 (32/64 bit) with g++-4.6.3
+- CentOS/RHEL 6.6 (64-bit) with g++-4.4.7
+- OS X Yosemite 10.10.3 with Xcode 6.3.1 and Apple LLVM version 6.1.0
+- FreeBSD 10.1-RELEASE (64 bit) with clang-3.4.1
+
+New user-visible features
+-------------------------
+- (network) CalculateTxTime has been declared obsolete.
+  CalculateBytesTxTime and CalculateBitsTxTime are to be used instead.
+  The return value is a Time, instead of a double.
+- (mobility) Classes added for converting geographic to cartesian coordinates.
+- (spectrum) TvSpectrumTransmitter models added to create television 
+  transmitter(s) that transmit PSD spectrums customized by attributes such 
+  as modulation type, power, antenna type, channel frequency, etc.
+- (wifi) Several model improvements have been made.  Access points now 
+  establish BSSBasicRateSet for control frame transmissions.  PLCP header 
+  and payload reception have been decoupled for improved PHY modeling
+  accuracy.  RTS/CTS with A-MPDU is now fully supported, and 802.11n
+  stations now support two-level aggregation.
+
+Bugs fixed
+----------
+- Bug 1757 - RLC AM not using NACK_SN
+- Bug 1974 - CalculateTxTime should return a Time, not a double
+- Bug 1982 - AODV and mesh use random variables before seed can be set
+- Bug 2004 - Wrong timeout calculation for 802.11n in WifiMac
+- Bug 2008 - (lr-wpan) Crash if ending rx while status change is in progress
+- Bug 2025 - (lr-wpan) Changing the channel doesn't affect the Tx params
+- Bug 2034 - (lr-wpan) CSMA-CA BackoffPeriod is too short 
+- Bug 2054 - TCP window update can shrink the Left Edge of the window
+- Bug 2066 - A-MPDU reception should check for successful preamble
+- Bug 2067 - TCP performance when advertised window exceeds sender buffer size
+- Bug 2070 - Wrong report of Packets and Bytes stored in CoDeL
+- Bug 2073 - NDisc cache entries update timer might be stuck in a loop
+- Bug 2075 - A-MPDU using RTS/CTS behaves wrongly when MaxSsrc is reached
+- Bug 2076 - TCP MinRTO Attribute is not actually used
+- Bug 2077 - Icmpv6L4Protocol::HandleDestinationUnreachable must check the packet size, not its serialized size
+- Bug 2079 - mcs variable in ht-wifi-network example is confusing
+- Bug 2082 - Empirical RV fails if the value provided in the CDF member function is negative
+- Bug 2083 - BridgeNetDevice may send corrupted packets
+- Bug 2087 - Waf fails to build ns-3 if the path contains accented characters
+- Bug 2090 - (rip-ng) Routes may be added twice on interface activation
+- Bug 2093 - MultiModelSpectrumChannel::GetDevice only works for 0-th index
+- Bug 2095 - (wimax) Wrong values in default-traces.h for 16 QAM 3/4
+- Bug 2097 - ACKs should be sent using legacy rates and preambles in 802.11n
+- Bug 2103 - Ipv[4,6]RoutingHelper::PrintRoutingTableAll[At,Every] hangs if a node doesn't have IP
+
+Known issues
+------------
+In general, known issues are tracked on the project tracker available
+at http://www.nsnam.org/bugzilla/
+
 Release 3.22
 ============
 
diff -Naur ns-3.22/src/antenna/model/antenna-model.cc ns-3.23/src/antenna/model/antenna-model.cc
--- ns-3.22/src/antenna/model/antenna-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/antenna/model/antenna-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -44,6 +44,7 @@
 {
   static TypeId tid = TypeId ("ns3::AntennaModel")
     .SetParent<Object> ()
+    .SetGroupName("Antenna")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/antenna/model/cosine-antenna-model.cc ns-3.23/src/antenna/model/cosine-antenna-model.cc
--- ns-3.22/src/antenna/model/cosine-antenna-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/antenna/model/cosine-antenna-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::CosineAntennaModel")
     .SetParent<AntennaModel> ()
+    .SetGroupName("Antenna")
     .AddConstructor<CosineAntennaModel> ()
     .AddAttribute ("Beamwidth",
                    "The 3dB beamwidth (degrees)",
diff -Naur ns-3.22/src/antenna/model/isotropic-antenna-model.cc ns-3.23/src/antenna/model/isotropic-antenna-model.cc
--- ns-3.22/src/antenna/model/isotropic-antenna-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/antenna/model/isotropic-antenna-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::IsotropicAntennaModel")
     .SetParent<AntennaModel> ()
+    .SetGroupName("Antenna")
     .AddConstructor<IsotropicAntennaModel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/antenna/model/parabolic-antenna-model.cc ns-3.23/src/antenna/model/parabolic-antenna-model.cc
--- ns-3.22/src/antenna/model/parabolic-antenna-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/antenna/model/parabolic-antenna-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::ParabolicAntennaModel")
     .SetParent<AntennaModel> ()
+    .SetGroupName("Antenna")
     .AddConstructor<ParabolicAntennaModel> ()
     .AddAttribute ("Beamwidth",
                    "The 3dB beamwidth (degrees)",
diff -Naur ns-3.22/src/aodv/bindings/modulegen__gcc_ILP32.py ns-3.23/src/aodv/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/aodv/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -7648,6 +7648,11 @@
                    [param('ns3::Time', 't')])
     ## aodv-routing-protocol.h (module 'aodv'): ns3::aodv::RoutingProtocol::AODV_PORT [variable]
     cls.add_static_attribute('AODV_PORT', 'uint32_t const', is_const=True)
+    ## aodv-routing-protocol.h (module 'aodv'): void ns3::aodv::RoutingProtocol::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
     return
 
 def register_Ns3AodvRoutingTable_methods(root_module, cls):
diff -Naur ns-3.22/src/aodv/bindings/modulegen__gcc_LP64.py ns-3.23/src/aodv/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/aodv/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -7648,6 +7648,11 @@
                    [param('ns3::Time', 't')])
     ## aodv-routing-protocol.h (module 'aodv'): ns3::aodv::RoutingProtocol::AODV_PORT [variable]
     cls.add_static_attribute('AODV_PORT', 'uint32_t const', is_const=True)
+    ## aodv-routing-protocol.h (module 'aodv'): void ns3::aodv::RoutingProtocol::DoInitialize() [member function]
+    cls.add_method('DoInitialize', 
+                   'void', 
+                   [], 
+                   visibility='protected', is_virtual=True)
     return
 
 def register_Ns3AodvRoutingTable_methods(root_module, cls):
diff -Naur ns-3.22/src/aodv/doc/aodv.rst ns-3.23/src/aodv/doc/aodv.rst
--- ns-3.22/src/aodv/doc/aodv.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/doc/aodv.rst	2015-05-13 11:05:27.000000000 -0700
@@ -94,37 +94,43 @@
 
 No announced plans.
 
-References
-++++++++++
-
-
-Usage
-*****
-
-Examples
-++++++++
-
-Helpers
-+++++++
-
-Attributes
-++++++++++
-
-Tracing
-+++++++
-
-Logging
-+++++++
-
-Caveats
-+++++++
-
-Validation
-**********
-
-Unit tests
-++++++++++
-
-Larger-scale performance tests
-++++++++++++++++++++++++++++++
+..
+  References
+  ++++++++++
+
+..
+  Usage
+  *****
+
+..
+  Examples
+  ++++++++
+
+..
+  Helpers
+  +++++++
+
+..
+  Attributes
+  ++++++++++
+
+..
+  Tracing
+  +++++++
+
+..
+  Logging
+  +++++++
+
+..
+  Caveats
+  +++++++
+
+..
+  Validation
+  **********
+  Unit tests
+  ++++++++++
+  Larger-scale performance tests
+  ++++++++++++++++++++++++++++++
 
diff -Naur ns-3.22/src/aodv/model/aodv-packet.cc ns-3.23/src/aodv/model/aodv-packet.cc
--- ns-3.22/src/aodv/model/aodv-packet.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/model/aodv-packet.cc	2015-05-13 11:05:27.000000000 -0700
@@ -46,6 +46,7 @@
 {
   static TypeId tid = TypeId ("ns3::aodv::TypeHeader")
     .SetParent<Header> ()
+    .SetGroupName("Aodv")
     .AddConstructor<TypeHeader> ()
   ;
   return tid;
@@ -153,6 +154,7 @@
 {
   static TypeId tid = TypeId ("ns3::aodv::RreqHeader")
     .SetParent<Header> ()
+    .SetGroupName("Aodv")
     .AddConstructor<RreqHeader> ()
   ;
   return tid;
@@ -292,6 +294,7 @@
 {
   static TypeId tid = TypeId ("ns3::aodv::RrepHeader")
     .SetParent<Header> ()
+    .SetGroupName("Aodv")
     .AddConstructor<RrepHeader> ()
   ;
   return tid;
@@ -434,6 +437,7 @@
 {
   static TypeId tid = TypeId ("ns3::aodv::RrepAckHeader")
     .SetParent<Header> ()
+    .SetGroupName("Aodv")
     .AddConstructor<RrepAckHeader> ()
   ;
   return tid;
@@ -500,6 +504,7 @@
 {
   static TypeId tid = TypeId ("ns3::aodv::RerrHeader")
     .SetParent<Header> ()
+    .SetGroupName("Aodv")
     .AddConstructor<RerrHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/aodv/model/aodv-routing-protocol.cc ns-3.23/src/aodv/model/aodv-routing-protocol.cc
--- ns-3.22/src/aodv/model/aodv-routing-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/model/aodv-routing-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -67,6 +67,7 @@
   {
     static TypeId tid = TypeId ("ns3::aodv::DeferredRouteOutputTag").SetParent<Tag> ()
       .SetParent<Tag> ()
+      .SetGroupName("Aodv")
       .AddConstructor<DeferredRouteOutputTag> ()
     ;
     return tid;
@@ -158,6 +159,7 @@
 {
   static TypeId tid = TypeId ("ns3::aodv::RoutingProtocol")
     .SetParent<Ipv4RoutingProtocol> ()
+    .SetGroupName("Aodv")
     .AddConstructor<RoutingProtocol> ()
     .AddAttribute ("HelloInterval", "HELLO messages emission interval.",
                    TimeValue (Seconds (1)),
@@ -580,12 +582,6 @@
   NS_ASSERT (ipv4 != 0);
   NS_ASSERT (m_ipv4 == 0);
 
-  if (EnableHello)
-    {
-      m_htimer.SetFunction (&RoutingProtocol::HelloTimerExpire, this);
-      m_htimer.Schedule (MilliSeconds (m_uniformRandomVariable->GetInteger (0, 100)));
-    }
-
   m_ipv4 = ipv4;
 
   // Create lo route. It is asserted that the only one interface up for now is loopback
@@ -1928,5 +1924,20 @@
   return socket;
 }
 
+void
+RoutingProtocol::DoInitialize (void)
+{
+  NS_LOG_FUNCTION (this);
+  uint32_t startTime;
+  if (EnableHello)
+    {
+      m_htimer.SetFunction (&RoutingProtocol::HelloTimerExpire, this);
+      startTime = m_uniformRandomVariable->GetInteger (0, 100);
+      NS_LOG_DEBUG ("Starting at time " << startTime << "ms");
+      m_htimer.Schedule (MilliSeconds (startTime));
+    }
+  Ipv4RoutingProtocol::DoInitialize ();
 }
-}
+
+} //namespace aodv
+} //namespace ns3
diff -Naur ns-3.22/src/aodv/model/aodv-routing-protocol.h ns-3.23/src/aodv/model/aodv-routing-protocol.h
--- ns-3.22/src/aodv/model/aodv-routing-protocol.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/model/aodv-routing-protocol.h	2015-05-13 11:05:27.000000000 -0700
@@ -97,6 +97,8 @@
   */
   int64_t AssignStreams (int64_t stream);
 
+protected:
+  virtual void DoInitialize (void);
 private:
   
   // Protocol parameters.
diff -Naur ns-3.22/src/aodv/test/aodv-chain-regression-test-0-0.pcap ns-3.23/src/aodv/test/aodv-chain-regression-test-0-0.pcap
--- ns-3.22/src/aodv/test/aodv-chain-regression-test-0-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/aodv-chain-regression-test-0-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,48 +1,48 @@
-��i�XX�������

��E4

+��i�XX�������

��E4

 



 

��� 
(

 


-



xXX���������E4

+



� XX���������E4

 


 

��� 
(


 


-



��TT�������

��E0


+



yTT�������

��E0


 



 

���
 




-


�4�@@�<��

+


�R�@@�<��

 


-

áԀ��@@������� ��


+

�Ԁ��@@������� ��


 

������
-


��@@�<

 ��


+


ך@@�<

 ��


 



-

f�Ԁ
F�TT�<
0��E0

+

��Ԁ
d�TT�<
0��E0

 


 


��
 


-


+�V�Ԁn�@@�������

0��



+


+�t�Ԁ��@@�������

0��



 


������
-

q�@@�<
@��

+

��@@�<
@��

 



-


��Ԁ��xx�<

@��ET@

+


��Ԁ��xx�<

@��ET@

 



-

��Ԁ
��@@�������P��


+

��Ԁ
��@@�������P��


 

������
-

f�Ԁ��xx�<`��ET?

+

��Ԁ��xx�<`��ET?

 



-

d
Ԁ>
xx�<
p��ET=

+

��Ԁ\�xx�<
p��ET=

 


-


N
Ԁ
xx�<

P��ET
@

+


l�Ԁ
xx�<

P��ET
@

 



 



�Ԁ

�
xx�<���ET
?

 



 



�Ԁ
pxx�<
���ET
=

 


-




�Ԁ
((TT����������E0


+




�Ԁ
g
TT����������E0


 


 

���
 


-

�
�TT�������

`��E0

+

�
}TT�������

`��E0

 



 

���
 




@@ -52,11 +52,11 @@
 



 

�Ԁ�xx�<
���ET=

 


-


�Ԁ�TT����������E0

+


�Ԁg
TT����������E0

 


 

���
 


-

���TT�������

���E0

+

�xiTT�������

���E0

 



 

���
 




@@ -66,11 +66,11 @@
 



 

�Ԁ�xx�<
���ET=

 


-


�Ԁ�TT�������
��E0

+


�ԀOTT�������
��E0

 


 

���
 


-

�p�TT�������

���E0

+

�}TT�������

���E0

 



 

���
 




@@ -94,56 +94,56 @@
 


 

���
 


-

��FTT�<
0
��E0


+

�sRTT�<
0
��E0


 


 


��
 


-

�FԀ��TT�������

���E0

+

�RԀ0uTT�������

���E0

 



 

���
 




-


��XX�������

���E4

-



-

��� 
 
-


-


�/TT�������@
��E0

+


�� TT�������@
��E0

 


 

���
 


-

��3XX�������P
��E4

+

�(#XX�������

���E4

+



+

��� 
 
+


+


XKXX�������P
��E4

 


 

��� 
 

 


-


(#TT�������

���E0

+


�TT�������

���E0

 



 

���
 



-


��;TT�������`
��E0

+


�PKTT�������`
��E0

 


 

���
 


-

��TT�������

���E0

+

�(#TT�������

���E0

 



 

���
 



-


��;TT�������p
��E0

+


�PKTT�������p
��E0

 


 

���
 


-

�'XXX�������


��E4	

+

��@XX�������


��E4	

 



 

��� 
 
 


-


X�XX��������
��E4	

+


�IXX��������
��E4	

 


 

��� 
 

 


-


�@TT�������


��E0
+


�<TT�������


��E0
 

 



 

���
 



-


�aTT��������
��E0
+


��dTT��������
��E0
 

 


 

���
@@ -152,7 +152,7 @@
 



 

���
 



-


�	h|TT��������
��E0

+


�	�MTT��������
��E0

 


 

���
 


diff -Naur ns-3.22/src/aodv/test/aodv-chain-regression-test-1-0.pcap ns-3.23/src/aodv/test/aodv-chain-regression-test-1-0.pcap
--- ns-3.22/src/aodv/test/aodv-chain-regression-test-1-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/aodv-chain-regression-test-1-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,58 +1,58 @@
-��i`XX�������

��E4

+��i'
XX�������

��E4

 



 

��� 
(

 


-



�XX���������E4

+



g XX���������E4

 


 

��� 
(


 


-



I<XX���������E4

+



5XX���������E4

 


 

��� 
(

 


-



(�TT�������

��E0


+



�yTT�������

��E0


 



 

���
 




-


���@@�<��

+


��@@�<��

 


-

��Ԁ��@@������� ��


+

��Ԁ��@@������� ��


 

������
-

ğ@@�<��

+

�@@�<��

 


-

q�Ԁ��TT�<0��E0

+

��Ԁ��TT�<0��E0

 


 

��
 


-


+���Ԁ'�@@������� ��


+


+���ԀE�@@������� ��


 

������
-


*�@@�<

 ��


+


H�@@�<

 ��


 



-

:�Ԁ
��TT�<
0��E0

+

X�Ԁ
ܛTT�<
0��E0

 


 


��
 


-


+���Ԁ��@@�������

0��



+


+���Ԁ��@@�������

0��



 


������
-

�@@�<
@��

+

�@@�<
@��

 



-


��Ԁ��xx�<

@��ET@

+


��Ԁ��xx�<

@��ET@

 



-

��Ԁ
'�@@�������P��


+

��Ԁ
E�@@�������P��


 

������
-

*�@@�<@��

+

H�@@�<@��

 


-

:�Ԁ��xx�<`��ET?

+

X�Ԁ�xx�<`��ET?

 



-

��Ԁ��@@�������P��


+

��Ԁ��@@�������P��


 

������
-

b�Ԁ�
xx�<`��ET>

+

��Ԁ��xx�<`��ET>

 



-

N
Ԁ(
xx�<p��ET>

+

l�ԀF�xx�<p��ET>

 


-


8
Ԁ�
xx�<
p��ET=

+


V�Ԁ��xx�<
p��ET=

 


-


{
Ԁ
�xx�<

P��ET
@

+


��Ԁ
�xx�<

P��ET
@

 



 



�Ԁ


xx�<���ET
?

 



@@ -62,15 +62,15 @@
 


 




iԀ
�xx�<
���ET
=

 


-




�Ԁ
�'TT����������E0


+




�Ԁ
�TT����������E0


 


 

���
 


-

�
�0TT����������E0


+

�
h%TT����������E0


 


 

���
 


-

�
��TT�������

`��E0

+

�
�}TT�������

`��E0

 



 

���
 




@@ -84,15 +84,15 @@
 


 


�Ԁxx�<
���ET=

 


-


	ԀTT����������E0

+


	Ԁ�TT����������E0

 


 

���
 


-

�� TT����������E0

+

��HTT����������E0

 


 

���
 


-

���TT�������

���E0

+

�jTT�������

���E0

 



 

���
 




@@ -106,15 +106,15 @@
 


 


�Ԁ�xx�<
���ET=

 


-


�ԀTT�������
��E0

+


�Ԁ�TT�������
��E0

 


 

���
 


-

�DTT�������
��E0

+

��!TT�������
��E0

 


 

���
 


-

���TT�������

���E0

+

��}TT�������

���E0

 



 

���
 




@@ -138,56 +138,56 @@
 


 

���
 


-

�3FTT�<
0
��E0


+

��QTT�<
0
��E0


 


 


��
 


-

�FԀ��TT�������

���E0

+

�RԀ�uTT�������

���E0

 



 

���
 




-


�XX�������

���E4

-



-

��� 
 
-


-


p/TT�������@
��E0

+


�g TT�������@
��E0

 


 

���
 


-

�X3XX�������P
��E4

+

��#XX�������

���E4

+



+

��� 
 
+


+


�JXX�������P
��E4

 


 

��� 
 

 


-


�#TT�������

���E0

+


XTT�������

���E0

 



 

���
 



-


�(;TT�������`
��E0

+


��JTT�������`
��E0

 


 

���
 


-

�XTT�������

���E0

+

��#TT�������

���E0

 



 

���
 



-


�(;TT�������p
��E0

+


��JTT�������p
��E0

 


 

���
 


-

��XXX�������


��E4	

+

�HAXX�������


��E4	

 



 

��� 
 
 


-


�XX��������
��E4	

+


IXX��������
��E4	

 


 

��� 
 

 


-


@ATT�������


��E0
+


X=TT�������


��E0
 

 



 

���
 



-


��`TT��������
��E0
+


�pdTT��������
��E0
 

 


 

���
@@ -196,7 +196,7 @@
 



 

���
 



-


�	�{TT��������
��E0

+


�	MTT��������
��E0

 


 

���
 


diff -Naur ns-3.22/src/aodv/test/aodv-chain-regression-test-2-0.pcap ns-3.23/src/aodv/test/aodv-chain-regression-test-2-0.pcap
--- ns-3.22/src/aodv/test/aodv-chain-regression-test-2-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/aodv-chain-regression-test-2-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,62 +1,62 @@
-��ixXX���������E4

+��i� XX���������E4

 


 

��� 
(


 


-



�;XX���������E4

+



4XX���������E4

 


 

��� 
(

 


-




`XX���������E4

+



(IXX���������E4

 


 

��� 
(

 


-



,�@@�<��

+



Sm@@�<��

 


-

��Ԁe�@@������� ��


+

�nԀ��@@������� ��


 

������
-

��@@�<��

+

��@@�<��

 


-

4�ԀJ�TT�<0��E0

+

R�Ԁh�TT�<0��E0

 


 

��

 


-


+�Z�Ԁ2�@@������� ��


+


+�x�ԀP�@@������� ��


 

������
-

4�@@�<��

+

R�@@�<��

 


-

D�Ԁ��TT�<0��E0

+

b�Ԁ�TT�<0��E0

 


 

��
 


-


+�áԀ��@@������� ��


+


+��Ԁ��@@������� ��


 

������
-


f�Ԁ
F�TT�<
0��E0

+


��Ԁ
d�TT�<
0��E0

 


 


��
 


-


+�q�@@�<
@��

+


+���@@�<
@��

 



-


��Ԁ
��@@�������P��


+


��Ԁ
��@@�������P��


 

������
-

��@@�<@��

+

��@@�<@��

 


-

f�Ԁ��xx�<`��ET?

+

��Ԁ��xx�<`��ET?

 



-

��Ԁ"�@@�������P��


+

��Ԁ@�@@�������P��


 

������
-

%�@@�<@��

+

C�@@�<@��

 


-

5�Ԁ��xx�<`��ET>

+

S�Ԁ�xx�<`��ET>

 



-

�
Ԁ

@@�������P��


+

�Ԁ��@@�������P��


 

������
-

N
Ԁ�
xx�<`��ET=

+

l�Ԁ��xx�<`��ET=

 



-

�
Ԁ
xx�<p��ET?

+

��Ԁ0�xx�<p��ET?

 


-


"
Ԁp
xx�<p��ET>

+


@�Ԁ��xx�<p��ET>

 


-


d
Ԁ>
xx�<
p��ET=

+


��Ԁ\�xx�<
p��ET=

 


 



�Ԁ

�
xx�<���ET
?

 



@@ -70,15 +70,15 @@
 


 




�Ԁ
pxx�<
���ET
=

 


-




((TT����������E0


+




g
TT����������E0


 


 

���
 


-

�
0TT����������E0


+

�
�$TT����������E0


 


 

���
 


-

�
YPTT����������E0


+

�
�9TT����������E0


 


 

���
 


@@ -94,19 +94,19 @@
 


 


�Ԁ�xx�<
���ET=

 


-


�TT����������E0

+


g
TT����������E0

 


 

���
 


-

�` TT����������E0

-


-

���
-


-

��@TT����������E0

+

�PATT����������E0

 


 

���
 


-

��Ԁ
�
xx�<���ET?

+

�HTT����������E0

+


+

���
+


+

��Ԁ
�
xx�<���ET?

 



 

�
Ԁ,xx�<���ET>

 



@@ -118,39 +118,39 @@
 


 


�Ԁ�xx�<
���ET=

 


-


�TT�������
��E0

+


OTT�������
��E0

 


 

���
 


-

��CTT�������
��E0

+

�� TT�������
��E0

 


 

���
 


-

��HTT�������
��E0

+

�MTT�������
��E0

 


 

���
 


-

�xTT�������
��E0

+

��$TT�������
��E0

 


 

���
 


-

�` TT������� 
��E0

+

�O<TT������� 
��E0

 


 

���
 


-

��7TT�������0
��E0

+

��$TT�������0
��E0

 


 

���
 


-

�` TT�������@
��E0

+

�HTT�������@
��E0

 


 

���
 


-

��CTT�������P
��E0

+

�O<TT�������P
��E0

 


 

���
 


-

�	�7TT�������`
��E0	

+

�	�(TT�������`
��E0	

 


 

���
 


diff -Naur ns-3.22/src/aodv/test/aodv-chain-regression-test-3-0.pcap ns-3.23/src/aodv/test/aodv-chain-regression-test-3-0.pcap
--- ns-3.22/src/aodv/test/aodv-chain-regression-test-3-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/aodv-chain-regression-test-3-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,58 +1,58 @@
-��iI<XX���������E4

+��i5XX���������E4

 


 

��� 
(

 


-



q_XX���������E4

+



�HXX���������E4

 


 

��� 
(

 


-



�}TT���������E0

-


-

���
-


-

���@@���������


+



�l@@���������


 

������
-

��@@�<��

+

�l@@�<��

 


-

h�Ԁl�TT�< ��E0

+

�mԀ�nTT�<��E0

 


 

��
 


-


+�|�Ԁ��@@������� ��


+


+��nԀ�@@������� ��


 

������
-

��@@�<��

+

�@@�<��

 


-

�Ԁ��TT�<0��E0

+

%�Ԁ߃TT�<0��E0

 


 

��

 


-


+���Ԁ��@@������� ��


+


+���Ԁ��@@������� ��


 

������
-

q�Ԁ��TT�<0��E0

+

��Ԁ��TT�<0��E0

 


 

��
 


-


+�*�@@�<@��

+


+�H�@@�<@��

 


-

��Ԁ��@@�������P��


+

��Ԁ��@@�������P��


 

������
-

��@@�<@��

+

��@@�<@��

 


-

b�Ԁ�
xx�<`��ET>

+

��Ԁ��xx�<`��ET>

 



-

�
Ԁ

@@�������P��


+

��Ԁ-�@@�������P��


 

������
-


@@�<0��

+

/�@@�< ��

 


-

!
Ԁ�
xx�<`��ET=

+

?�Ԁ��xx�<`��ET=

 



-

�
Ԁ�
xx�<@��ET@

+

��Ԁ��xx�<0��ET@

 


-


�
ԀY
xx�<p��ET?

+


��Ԁw�xx�<p��ET?

 


-


N
Ԁ(
xx�<p��ET>

+


l�ԀF�xx�<p��ET>

 


-



Ԁ
�xx�<���ET
>

+


 5
TT�������@��E0

+


+

���
+


+

�
Ԁ
�xx�<���ET
>

 



 



�Ԁ
Cxx�<���ET
=

 



@@ -62,15 +62,15 @@
 


 




Ԁ
Yxx�<���ET
>

 


-




�0TT����������E0


+




h%TT����������E0


 


 

���
 


-

�
�OTT����������E0


+

�
�8TT����������E0


 


 

���
 


-

�
jTT�������`��E0


+

�
h)
TT�������`��E0


 


 

���
 


@@ -84,15 +84,15 @@
 


 


�Ԁ�xx�<���ET>

 


-


� TT����������E0

-


-

���
-


-

�1@TT����������E0

+


�@TT����������E0

 


 

���
 


-

�H^TT����������E0

+

��HTT����������E0

+


+

���
+


+

��@
TT����������E0

 


 

���
 


@@ -106,67 +106,67 @@
 


 


�Ԁtxx�<���ET>

 


-


DTT�������
��E0

+


�!TT�������
��E0

 


 

���
 


-

�
HTT�������
��E0

+

��LTT�������
��E0

 


 

���
 


-

��uTT����������E0

+

��@
TT����������E0

 


 

���
 


-

��STT�������
��E0

+

�8XTT�������
��E0

 


 

���
 


-

��uTT����������E0

+

�P-
TT����������E0

 


 

���
 


-

�q_TT������� 
��E0

+

��LTT������� 
��E0

 


 

���
 


-

�0bTT����������E0

+

��L
TT����������E0

 


 

���
 


-

��STT�������0
��E0

+

��@TT�������0
��E0

 


 

���
 


-

�p�TT����������E0

-


-

���
-


-

�@�TT�<@
��E0

+

�'
TT�<@
��E0

 


 

��
 




-

�Ԁ�WTT�������P
��E0

+

�
Ԁ�H
TT����������E0

+


+

���
+


+

�PTTT�������P
��E0

 


 

���
 


-

��}TT����������E0

+

�P-
TT����������E0

 


 

���
 


-

��[TT�������`
��E0

+

�5TT�������`
��E0

 


 

���
 


-

�0bTT����������E0

+

� 5
TT����������E0

 


 

���
 


-

�	I<TT�������p
��E0	

+

�	 \TT�������p
��E0	

 


 

���
 


-

�	jTT�������
��E0	

+

�	P-
TT�������
��E0	

 


 

���
 


diff -Naur ns-3.22/src/aodv/test/aodv-chain-regression-test-4-0.pcap ns-3.23/src/aodv/test/aodv-chain-regression-test-4-0.pcap
--- ns-3.22/src/aodv/test/aodv-chain-regression-test-4-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/aodv-chain-regression-test-4-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,48 +1,48 @@
-��i
`XX���������E4

+��i(IXX���������E4

 


 

��� 
(

 


-



}TT���������E0

-


-

���
-


-

�)�@@���������


+



Pl@@���������


 

������
-

,�@@�<��

+

Sm@@�<��

 


-

<�Ԁ�TT�< ��E0

+

cmԀnTT�<��E0

 


 

��
 


-


+���Ԁe�@@������� ��


+


+��nԀ��@@������� ��


 

������
-

4�ԀJ�TT�<0��E0

+

R�Ԁh�TT�<0��E0

 


 

��

 


-


+�%�@@�<@��

+


+�C�@@�<@��

 


-

�
Ԁ

@@�������P��


+

�Ԁ��@@�������P��


 

������
-

�

@@�<0��

+

��@@�< ��

 


-

N
Ԁ�
xx�<`��ET=

+

l�Ԁ��xx�<`��ET=

 



-

�
Ԁ�
xx�<@��ET@

+

��Ԁ��xx�<0��ET@

 


-


�
Ԁ
xx�<p��ET?

+


��Ԁ0�xx�<p��ET?

 


-



!Ԁ
�xx�<���ET
=

+


�4
TT�������@��E0

+


+

���
+


+

�
!Ԁ
�xx�<���ET
=

 



 



Ԁ
Yxx�<P��ET
@

 


 




NԀ
Cxx�<���ET
?

 


-




YPTT����������E0


+




�9TT����������E0


 


 

���
 


-

�
xiTT�������`��E0


+

�
�(
TT�������`��E0


 


 

���
 


@@ -52,11 +52,11 @@
 


 


NԀ�xx�<���ET?

 


-


�@TT����������E0

+


PATT����������E0

 


 

���
 


-

��]TT����������E0

+

�P@
TT����������E0

 


 

���
 


@@ -66,63 +66,63 @@
 


 


NԀ^xx�<���ET?

 


-


�HTT�������
��E0

+


MTT�������
��E0

 


 

���
 


-

�0uTT����������E0

+

�P@
TT����������E0

 


 

���
 


-

�ATTT�������
��E0

+

��XTT�������
��E0

 


 

���
 


-

�0uTT����������E0

+

��,
TT����������E0

 


 

���
 


-

��_TT������� 
��E0

+

�MTT������� 
��E0

 


 

���
 


-

��aTT����������E0

+

�L
TT����������E0

 


 

���
 


-

�ATTT�������0
��E0

+

�PATT�������0
��E0

 


 

���
 


-

��TT����������E0

-


-

���
-


-

�ȉTT�<@
��E0

+

��
TT�<@
��E0

 


 

��
 




-

؉Ԁ)XTT�������P
��E0

+

�
Ԁ H
TT����������E0

+


+

���
+


+

��TTT�������P
��E0

 


 

���
 


-

�}TT����������E0

+

��,
TT����������E0

 


 

���
 


-

�\TT�������`
��E0

+

��5TT�������`
��E0

 


 

���
 


-

��aTT����������E0

+

��4
TT����������E0

 


 

���
 


-

�	�<TT�������p
��E0	

+

�	�\TT�������p
��E0	

 


 

���
 


-

�	xiTT�������
��E0	

+

�	�,
TT�������
��E0	

 


 

���
 


diff -Naur ns-3.22/src/aodv/test/bug-606-test-0-0.pcap ns-3.23/src/aodv/test/bug-606-test-0-0.pcap
--- ns-3.22/src/aodv/test/bug-606-test-0-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/bug-606-test-0-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,48 +1,48 @@
-��i�XX���������E4

+��i@XX���������E4

 



 

��� 
(

 


-



�XX���������E4

+



0(XX���������E4

 


 

��� 
(


 


-



3)@@�<��

+



�D@@�<��

 


-

V*Ԁ�I@@������� ��


+

�EԀ"e@@������� ��


 

������
-


�I@@�<��

+


De@@�<��

 



-

�JԀyKTT�<0��E0

+

�eԀ�fTT�<0��E0

 


 


��

 


-


+��KԀ1W@@������� ��


+


+��fԀ�r@@������� ��


 


������
-

4X@@�<@��

+

�s@@�<@��

 


-


DXԀ�Xxx�<0��ET@

+


�sԀDtxx�<0��ET@

 



-

�YԀ`mTT�������@��E0


+

8uԀ}TT�������@��E0


 



 

���
 




-


�Ty@@�������P��


+


���@@�������P��


 

������
-

#zԀW{xx�<`��ET?

+

{�Ԁ��xx�<`��ET?

 



-

�|Ԁ�}xx�<p��ET?

+

�Ԁ6�xx�<p��ET?

 


-


�}Ԁ
xx�<P��ET
@

+


F�Ԁ
xx�<P��ET
@

 



 



�Ԁ
�
xx�<���ET
?

 



 



!Ԁ
1xx�<���ET
?

 


-




AԀ
�TT����������E0


+




AԀ
hGTT����������E0


 


 

���
 


-

�
`mTT�������`��E0

+

�
�]TT�������`��E0

 



 

���
 




@@ -52,7 +52,7 @@
 


 


:$Ԁ�$xx�<���ET@

 



-

�%Ԁ�/TT����������E0

+

�%Ԁ((TT����������E0

 


 

���
 


@@ -60,61 +60,61 @@
 

������
 

5FԀ�Gxx�<���ET?

 



-

 NTT����������E0

+

\@@�<���

+


+

�]ԀHqTT����������E0

 



 

���
 




-


�\@@�<���

-


-

�]Ԁ�|@@�������
��


+


�0}@@�������
��


 

������
-


}@@�<���

+


R}@@�<���

 



-

�}Ԁ�~xx�<
��ET?

+

�}Ԁ xx�<
��ET?

 


-


�~Ԁxx�<���ET@

+


0Ԁxx�<���ET@

 



 

�Ԁ�
xx�< 
��ET?

 



 

!Ԁxx�<0
��ET?

 


-


Ԁ�TT�������@
��E0

+


Ԁ((TT�������@
��E0

 


 

���
 


-

��aTT����������E0

+

��TT����������E0

 



 

���
 




 


�(#@@����������


 


������
-

HqTT����������E0

+

�aTT����������E0

 



 

���
 




 


�@@����������


 


������
-

RTT�������
��E0

+

}TT�������
��E0

 



 

���
 




 


�@@�������
��


 


������
-

`mTT������� 
��E0

+

�eTT������� 
��E0

 



 

���
 




 


�@@�������0
��


 


������
-

�XX�������@
��E4

+

'XX�������@
��E4

 



 

��� 
 
 


-


'TT�������P
��E0	

+


(#TT�������P
��E0	

 



 

���
 



-


�	(#TT�������`
��E0
+


�	�TT�������`
��E0
 

 



 

���
diff -Naur ns-3.22/src/aodv/test/bug-606-test-1-0.pcap ns-3.23/src/aodv/test/bug-606-test-1-0.pcap
--- ns-3.22/src/aodv/test/bug-606-test-1-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/bug-606-test-1-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,52 +1,52 @@
-��i`XX���������E4

+��i�XX���������E4

 



 

��� 
(

 


-



HXX���������E4

+



�'XX���������E4

 


 

��� 
(


 


-



�(@@���������


+



�C@@���������


 

������
-

�(@@�<��

+

D@@�<��

 


-

p)Ԁ*TT�<��E0

+

�DԀrETT�<��E0

 


 

��
 


-


+�**ԀZI@@������� ��


+


+��EԀ�JTT������� ��E0

+


+

���
+


+

��d@@������� ��


 

������
-


\J@@�<��

+


�e@@�<��

 



-

lJԀ�JTT�<0��E0

+

�eԀHfTT�<0��E0

 


 


��

 


-


+��KԀ�W@@������� ��


+


+�
gԀ�r@@������� ��


 


������
-

�W@@�<@��

+

s@@�<@��

 


-


pXԀ�Yxx�<0��ET@

+


�sԀ�txx�<0��ET@

 



-

�YԀ�mTT�������@��E0


+

uԀ�}TT�������@��E0


 



 

���
 




-


��x@@�������P��


+


�<�@@�������P��


 

������
-

�y@@�< ��

+

?�@@�<0��

 


-

�yԀ�zxx�<`��ET?

+

O�Ԁ��xx�<`��ET?

 



-

�{Ԁ�|xx�<0��ET@

-


-


�|Ԁ&}xx�<p��ET?

+

�ԀƗxx�<@��ET@

 


-


~Ԁ��TT�������@��E0

+


֗Ԁ~�xx�<p��ET?

 


-

���
-


-

�
�xx�<P��ET
@

+


r�Ԁ
�xx�<P��ET
@

 



 



�Ԁ

xx�<���ET
?

 



@@ -54,55 +54,55 @@
 


 




�Ԁ
yxx�<���ET
?

 


-




nԀ
0TT����������E0


+




nԀ
�'TT�������`��E0


+


+

���
+


+

�
�FTT����������E0


 


 

���
 


-

�
�mTT�������`��E0

+

�
H^TT�������`��E0

 



 

���
 




-


�
��TT�������`��E0


-


-

���
-


-

��#@@�������p��


+


��#@@�������p��


 


������
 

�#@@�<���

 


 


g$Ԁ�%xx�<���ET@

 



-

�%Ԁp/TT����������E0

+

�%Ԁ�'TT����������E0

 


 

���
 


-

��D@@����������


+

��+TT�������p��E0

+


+

���
+


+

��D@@����������


 

������
-

�E@@�<p��

+

�E@@�<���

 


 

	FԀ�Fxx�<���ET?

 



-

�GԀ�NTT����������E0

-



-

���
-




-


��[@@����������


+

�GԀ�[@@����������


 

������
 

�[@@�<���

 


-

T\ԀI]xx�<���ET@

+

T\Ԁ]xx�<���ET@

 


-


Y]Ԁ�|@@�������
��


+


�]Ԁ�qTT����������E0

+



+

���
+




+


��|@@�������
��


 

������
-


�}@@�<���

+


�}@@�<���

 



-

�}Ԁ2~xx�<
��ET?

+

�}Ԁh~xx�<
��ET?

 


-


'Ԁ��TT����������E0

-


-

���
-


-

��xx�<���ET@

+


]Ԁ�xx�<���ET@

 



 

�Ԁ
xx�< 
��ET?

 



@@ -110,39 +110,39 @@
 


 


�ԀLxx�<0
��ET?

 


-


AԀ0TT�������@
��E0

+


AԀ�'TT�������@
��E0

 


 

���
 


-

�0bTT����������E0

-



-

���
-




-


���TT����������E0

+

��FTT����������E0

 


 

���
 


-

�0TT�������P
��E0

+

�p�TT����������E0

+



+

���
+




+


�?TT�������P
��E0

 


 

���
 


-

��'TT�������`
��E0

+

�?TT�������`
��E0

 


 

���
 


-

��'TT�������p
��E0

+

��+TT�������p
��E0

 


 

���
 


-

�TT��������
��E0

+

��FTT��������
��E0

 


 

���
 


-

�p/TT��������
��E0

+

��BTT��������
��E0

 


 

���
 


-

�	�+TT��������
��E0	

+

�	�TT��������
��E0	

 


 

���
 


diff -Naur ns-3.22/src/aodv/test/bug-606-test-2-0.pcap ns-3.23/src/aodv/test/bug-606-test-2-0.pcap
--- ns-3.22/src/aodv/test/bug-606-test-2-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/bug-606-test-2-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,112 +1,112 @@
-��i�XX���������E4

+��i0(XX���������E4

 


 

��� 
(


 


-



0(@@���������


+



�C@@���������


 

������
-

3)@@�<��

+

�D@@�<��

 


-

C)Ԁ�)TT�<��E0

+

�DԀ�DTT�<��E0

 


 

��
 


-


+�V*Ԁ�I@@������� ��


+


+��EԀ8JTT������� ��E0

+


+

���
+


+

�"e@@������� ��


 

������
-


�JԀyKTT�<0��E0

+


�eԀ�fTT�<0��E0

 


 


��

 


-


+�4X@@�<@��

+


+��s@@�<@��

 


-


�YԀTy@@�������P��


+


8uԀ��@@�������P��


 

������
-

vy@@�< ��

+

Δ@@�<0��

 


-

#zԀW{xx�<`��ET?

+

{�Ԁ��xx�<`��ET?

 



-

g{Ԁ�{xx�<0��ET@

+

��Ԁ
�xx�<@��ET@

 


-


�|Ԁ�}xx�<p��ET?

+


�Ԁ6�xx�<p��ET?

 


-


(�TT�������@��E0

-


-

���
-


-

�
�Ԁ
�
xx�<���ET
?

+



�Ԁ
�
xx�<���ET
?

 



 



�
Ԁ
,xx�<P��ET
@

 


 




!Ԁ
1xx�<���ET
?

 


-




�TT����������E0


-


-

���
-


-

�
8�TT�������`��E0


+




'TT�������`��E0


 


 

���
 


-

�*$@@�<���

+

�
hGTT����������E0


+


+

���
+


+

�*$@@�<���

 


-


�%Ԁ�/TT����������E0

+


�%Ԁ((TT����������E0

 


 

���
 


-

�fE@@����������


+

��*TT�������p��E0

+


+

���
+


+

�fE@@����������


 

������
-

�E@@�<p��

+

�E@@�<���

 


 

5FԀ�Gxx�<���ET?

 



-

�GԀ[@@����������


+

�GԀ[@@����������


 

������
 

\@@�<���

 


-

(\Ԁ�\xx�<���ET@

+

(\Ԁ�\xx�<���ET@

 


-


�]Ԁ�|@@�������
��


+


�]Ԁ0}@@�������
��


 

������
-


�}Ԁ�~xx�<
��ET?

-


-


�TT����������E0

+


�}Ԁ xx�<
��ET?

 


-

���
-


-

��Ԁ�
xx�< 
��ET?

+


�Ԁ�
xx�< 
��ET?

 



 

�
Ԁ,xx�<���ET@

 


 


!Ԁxx�<0
��ET?

 


-


�TT�������@
��E0

+


((TT�������@
��E0

 


 

���
 


-

���TT����������E0

+

�PFTT����������E0

 


 

���
 


-

�P�TT����������E0

+

��2TT����������E0

 


 

���
 


-

�ȯTT����������E0

+

�(#TT����������E0

 


 

���
 


-

�(�TT����������E0

+

�8JTT����������E0

 


 

���
 


-

�8�TT�������
��E0

+

��.TT�������
��E0

 


 

���
 


-

��TT�������
��E0

+

��2TT�������
��E0

 


 

���
 


-

�	ȯTT������� 
��E0	

+

�	�6TT������� 
��E0	

 


 

���
 


diff -Naur ns-3.22/src/aodv/test/bug-772.cc ns-3.23/src/aodv/test/bug-772.cc
--- ns-3.22/src/aodv/test/bug-772.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/bug-772.cc	2015-05-13 11:05:27.000000000 -0700
@@ -133,9 +133,12 @@
   InternetStackHelper internetStack;
   internetStack.SetRoutingHelper (aodv);
   internetStack.Install (*m_nodes);
+  streamsUsed += internetStack.AssignStreams (*m_nodes, streamsUsed);
+  // Expect to use (3*m_size) more streams for internet stack random variables
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((devices.GetN () * 6) + (3*m_size)), "Stream assignment mismatch");
   streamsUsed += aodv.AssignStreams (*m_nodes, streamsUsed);
   // Expect to use m_size more streams for AODV
-  NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((devices.GetN () * 6) + m_size), "Stream assignment mismatch");
+  NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((devices.GetN () * 6) + (3*m_size) + m_size), "Stream assignment mismatch");
   Ipv4AddressHelper address;
   address.SetBase ("10.1.1.0", "255.255.255.0");
   Ipv4InterfaceContainer interfaces = address.Assign (devices);
diff -Naur ns-3.22/src/aodv/test/tcp-chain-test-0-0.pcap ns-3.23/src/aodv/test/tcp-chain-test-0-0.pcap
--- ns-3.22/src/aodv/test/tcp-chain-test-0-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/tcp-chain-test-0-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,68 +1,67 @@
-��i�YTT���������E0

+��i�.TT���������E0

 



 

���
 



-


�x�TT���������E0

+


��H
TT���������E0

 


 

���
 


-

�
@XX���������E4


+

�
XX���������E4


 



 

��� 
(

 


 
-




pGXX���������E4


+




` XX���������E4


 


 

��� 
(


 


 
-




&8
@@�< ��

+





@@�< ��

 


-


�9
Ԁ
5Q
@@�������0��


+


�
Ԁ

@@�������0��


 

������
-



WQ
@@�< ��

+



4
@@�< ��

 



-


R
Ԁ
4S
TT�<@��E0

+


�
Ԁ

TT�<@��E0

 


 


��
 


 
-


�
DS
Ԁ
�f
@@�������0��


+


�
!
Ԁ
o
@@�������0��


 


������
-


�g
@@�<P��

+


�
@@�<P��

 


-



�g
Ԁ
h
\\�<@��E8@
+



�
Ԁ

\\�<@��E8@
 



 


 �
	��
-�
�h
Ԁ

-m
@@�������`��


+�
�
Ԁ
�'
@@�������`��


 

������
-


�m
Ԁ
�n
\\�<p��E8?
+


�(
Ԁ
�)
\\�<p��E8?
 



 


 �
	��
-�
��
Ԁ
Z�
\\�<���E88
+�
	�
Ԁ
��
\\�<���E88
 


 
 


	�

��
-X�
j�
Ԁ
��
XX�<P��E4
@
+J�
Ϟ
Ԁ
�
XX�<P��E4
@
 



 


 �
	

��
-]X
��
Ԁ
m�
XX�<���E4
?
+RJ
�
Ԁ
Ҡ
XX�<���E4
?
 



 


 �
	

��
-]X
H�
pp�<`��EL@
+RJ
H�
pp�<`��EL@
 



 


 �
	

��
-eX
��
Ԁ
V�
pp�<���EL?
+eJ
��
Ԁ
V�
pp�<���EL?
 



 


 �
	

��
-eX
'Ԁ
�XX�<���E4
8
+eJ
'Ԁ
�XX�<���E4
8
 


 
 


	�

�z
@@ -106,349 +105,155 @@
 



 


 �
		�
��
-_�
r�((�<���E@
+_�
��Ԁ
��pp�<
��EL?
 



 


-�
		�
��
-_�
��Ԁ
��((�<
��E?
+�
	�
��
+_�
��((�<
��E?
 



 


 �
		�
��
-_�
��Ԁ
`�XX�< 
��E48
-


-
-


	�

	�z
-g_
p�Ԁ
 �pp�<���EL@
+_�
%�((�<
��E?
 



 


-�
	�
��
-�g
��Ԁ
.�pp�<0
��EL?
-



-


-�
	�
��
-�g
��((�<���E	@
+�
		�
��
+_�
��((�<
��E?
 



 


-�
	
�
��
-�g
�((�<���E	@
+�
		�
��
+_�
�((�<
��E?
 



 


-�
	
�
��
-�g
�Ԁ
3�((�<@
��E	?
+�
		�
��
+_�
;�((�<
��E?
 



 


-�
	
�
��
-�g
o�Ԁ
!�XX�<P
��E48
+�
		�
��
+_�

Ԁ
�
XX�< 
��E48
 


 
-


	�


рz
-��
1�Ԁ
h�	pp�<���EL
-@
-



-


-�
	�
��
-Y�
��	Ԁ
v�	pp�<`
��EL
-?
-



-


-�
	�
��
-Y�
.�	((�<���E@
-



-


-�
	�
��
-Y�
Y�	((�<���E@
-



-


-�
	�
��
-Y�
��	Ԁ
��	((�<p
��E?
-



-


-�
	�
��
-Y�
t�	Ԁ
&�	XX�<�
��E48
+


	�

	�z
+r_
�
Ԁ
|TT�<0
��E0


+


+


��
+


 


-
-


	�

��z
-aY
6�	Ԁ
�qpp�<
��EL@
+
�Ԁ
�XX����������E4

 



+

��� 
 
 


-�
	�
��
-�a
DuԀ
�xpp�<�
��EL?
-



+
+



��XX�������@
��E4

+


+

��� 
 

 


-�
	�
��
-�a
Iy((�<
��E
@
-



+
+



߮Ԁ
ȯTT�<P
��E0

+


+


��
 


-�
	�
��
-�a
t}((�<
��E
@
+
+


L
دԀ
&�pp�<���EL@
 



 


-�
	�
��
-�a
��Ԁ
Ã((�<�
��E
?
+�
	�
��
+�r
��Ԁ
P�pp�<`
��EL?
 



 


-�
	�
��
-�a
6�Ԁ
�XX�<�
��E48
+�
	�
��
+�r
;�Ԁ
��XX�<p
��E48
 


 
-


	�

��z
-��
��Ԁ
�Y
pp�< 
��EL@
-



-


-�
	q
��
-S�
�]
Ԁ
a
pp�<�
��EL?
-



-


-�
	q
��
-S�
�a
((�<0
��E@
-



-


-�
	�
��
-S�

f
((�<0
��E@
+


	�

	�z
+��
��Ԁ
h�	pp�<���EL
+@
 



 


-�
	�
��
-S�
Bi
Ԁ
\l
((�<�
��E?
+�
	�
��
+Y�
��	Ԁ
v�	pp�<�
��EL
+?
 



 


-�
	�
��
-S�
��
Ԁ
E�
XX�<�
��E48
+�
	�
��
+Y�
>�	Ԁ
�	XX�<�
��E48
 


 
-


	�

��z
-[S
U�
Ԁpp�<@
��EL@
-



-


-�
	Y
��
-�[�Ԁ�((�<P
��E@
-



-


-�
	q
��
-�[0((�<P
��E@
-



-


-�
	q
��
-�[
-((�<P
��E@
+


	�

	�~�
+aY
�	Ԁ�0@@����������


+


������
+

�1@@�<�
��

+


+


�1ԀL2pp�<
��EL@
 



 


-�
	q
��
-�[?Ԁ�((�<��E?
+�
		�
��
+	\a�5ԀUU@@��������
��


+

������
+

$VԀ�Ypp�<�
��EL?
 



 


-�
	q
��
-�[TT�������`
��E0

+�
		�
��
+	\a�TT�������
��E0

 



 

���
-




-


��=Ԁ7>XX�<��E48
-


-
-


	�

q�z
-��G>Ԁ�?TT������� ��E0

+



+


�`�TT��������
��E0

 


 

���
 


-

�H�
@@�������p
��


-


������
-

J�
@@�<0��

-


-


Z�
Ԁ��
pp�<�
��EL@
-



-


-�
	A
��
-M�a�
Ԁ��
((�<�
��E@
-



-


-�
	!Y
��
-M��
Ԁe�
@@�������@��


-

������
-

4�
Ԁ��
pp�<P��EL?
-



-


-�
	A
��
-M�z�
((�<`��E?
-



-


-�
	!Y
��
-M���@@�<p��

+

���@@�<�
��

 


-

M�Ԁ��@@����������


+

U�Ԁ)�@@��������
��


 

������
-


�@@�<�
��

+


K�@@�< 
��

 



-

��Ԁ��XX�<���E4	8
+

��Ԁ��XX�<��E48
 


 
-


	�

!Y�z
-rM	�Ԁ��pp�<�
��EL@
-



-


-�
	#)
��
-�r$�Ԁ��pp�<���EL?
-



-


-�
	#)
��
-�rM�((�<�
��E@
-



-


-�
	%A
��
-�rT�((�<�
��E@
-



-


-�
	%A
��
-�r��Ԁ��((�<���E?
-



-


-�
	%A
��
-�rzԀ,XX�<���E4
-8
-


-
-


	�

%A�z
-��<Ԁظpp�<�
��EL@
-



-


-�
	'
��
-	G�l�Ԁ�pp�<���EL?
-



-


-�
	'
��
-	G�h�((�<�
��E@
-



-


-�
	))
��
-	G���((�<�
��E@
-



-


-�
	))
��
-	G���Ԁ�((�<���E?
-



-


-�
	))
��
-	G���Ԁ��XX�<���E48
-


-
-


	�

))�z
-	O	G��Ԁ �pp�<�
��EL@
-



-


-�
	*�
��
-	�	O��Ԁ.�pp�<��EL?
+


	�


р~�
+	�	\��ԀP�pp�<0
��EL@
 



 


-�
	*�
��
-	�	O�((�<��E@
-



-


-�
	-
��
-	�	OY�((�<��E@
-



-


-�
	-
��
-	�	O��Ԁ��((�<��E?
-



-


-�
	-
��
-	�	Oj�Ԁ�XX�< ��E48
-


-
-


	�

-�z
-	�	�,�Ԁh�	pp�<��EL@
-



-


-�
	.�
��
-
-A	���	Ԁv�	pp�<0��EL?
-



-


-�
	.�
��
-
-A	�
-�	((�< ��E@
-



-


-�
	0�
��
-
-A	�t�	((�< ��E@
-



-


-�
	0�
��
-
-A	���	ԀÛ	((�<@��E?
-



-


-�
	0�
��
-
-A	���	Ԁ_�	XX�<P��E4
8
-


-
-


	�

0��z
-
-I
-Ao�	Ԁ�qpp�<0��EL@
-



-


-�
	2�
��
-
-�
-IDuԀ�xpp�<`��EL?
-



-


-�
	2�
��
-
-�
-IIy((�<@��E@
+�
	
�
��
+	�	���Ԁ4�pp�<@
��EL
@
 



 


-�
	4�
��
-
-�
-I�}((�<@��E@
+�
	�
��
+	�	���Ԁypp�<��EL?
 



 


-�
	4�
��
-
-�
-IրԀ��((�<p��E?
+�
	
�
��
+	�	��pp�< ��EL
?
 



 


-�
	4�
��
-
-�
-IU�Ԁ�XX�<���E48
+�
	�
��
+	�	��TԀ�VXX�<0��E48
 


 
-


	�

4�z
-
-�
-��Ԁ�Y
pp�<P��EL@
+


	�

��
+	�	��VԀ�Vpp�<P
��EL@
 



 


-�
	6�
��
-;
-��]
Ԁa
pp�<���EL?
-



+�
	

��
+	�	��ZԀ�[LL�<@��E(

+


+


��

 


-�
	6�
��
-;
-��a
((�<`��E@
+�[Ԁ\pp�<`
��EL@
 



 


-�
	8�
��
-;
-��e
((�<`��E@
-



+�
	
��
+	�	��_Ԁ�`TT�<P��E0

+


+


��
+


 


-�
	8�
��
-;
-�i
Ԁ8l
((�<���E?
-



+�`Ԁ�aLL�<`��E(

+


+


��

 


-�
	8�
��
-;
-���
Ԁa�
XX�<���E48
+�aԀ�qԀ�LL�<p��E(

+


+


��

 


-
-


	�

8ɀz
-C;q�
Ԁ
\ No newline at end of file
+.�Ԁ
\ No newline at end of file
diff -Naur ns-3.22/src/aodv/test/tcp-chain-test-9-0.pcap ns-3.23/src/aodv/test/tcp-chain-test-9-0.pcap
--- ns-3.22/src/aodv/test/tcp-chain-test-9-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/tcp-chain-test-9-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,73 +1,73 @@
-��i�eTT���������E0

+��i��TT���������E0

 


 
 

���
 


 
 


-�xP
TT���������E0

+���TT���������E0

 

	
 

���
 

	
-

	�
PFTT���������E0


+

	�
(�TT���������E0


 


 
 

���
 


 
 


-�
�@@���������


+�
�@@���������


 

	������
 


-
%�@@�< ��

+
	�@@�< ��

 


 
-

	
ҖԀ
|�TT�< ��E0

+

	
��Ԁ
`�TT�< ��E0

 

	
 


 ��
 




 


-_
��Ԁ
��@@�������0��


+_
p�Ԁ
e�@@�������0��


 

	������
-


��Ԁ
r�TT�<@��E0

+


4�Ԁ
&�TT�<@��E0

 

	
 

��@

 


 
-


�
��@@�<P��

-

	
-


��Ԁ
81
TT�������`��E0


+


�
H�TT�������P��E0


 

	
 

���
 

	
-

	�
@�
Ԁ
��
\\�<p��E88
+

	�
��@@�<`��

+

	
+


��Ԁ
Հ
Ԁ
��
\\�<p��E88
 



 


 �
	��
-�
�
Ԁ
��
@@�������0��


+�
��
Ԁ
�
@@�������0��


 


 ������
-

	
��
@@�<���

+

	
�
@@�<���

 

	
 


-
��
Ԁ
�
\\�<@��E8@
+
%�
Ԁ
s�
\\�<@��E8@
 


 
 


	�

��
-X�
��
Ԁ
��
\\�<���E8?
+J�
D�
Ԁ
�
\\�<���E8?
 


 
 


	�

��
-X�
@�
Ԁ
��
XX�<���E4
8
+J�
��
Ԁ
W�
XX�<���E4
8
 



 


 �
	

��
-]X
�
Ԁ
�Ԁ
S	pp�<���EL8
+RJ
g�
Ԁ
�Ԁ
S	pp�<���EL8
 



 


 �
	

��
-eX
c	Ԁ
�	XX�<P��E4
@
+eJ
c	Ԁ
�	XX�<P��E4
@
 


 
 


	�

�z
@@ -96,394 +96,98 @@
 



 


 �
	

��
-��
yԀ
i�Ԁ
��pp�<
��EL8
+��
yԀ
s
Ԁ
�pp�<
��EL8
 



 


 �
	�
��
-_�
��Ԁ
A�XX�<p��E4@
+_�
�Ԁ
KXX�<p��E4@
 


 
 


	�

	�z
-g_
�Ԁ
#�XX�< 
��E4?
+r_
Ԁ
-XX�< 
��E4?
 


 
 


	�

	�z
-g_
��XX�< 
��E4?
+r_
��Ԁ
R�TT�<0
��E0


+

	
 


-
-


	�

	�z
-g_
��Ԁ
��((�<0
��E8
-



+��
+



 


-�
		�
��
-_�
�Ԁ
��Ԁ
+�pp�<@
��EL8
+?
b�Ԁ
��Ԁ
q�pp�<@
��EL8
 



 


 �
	�
��
-�g
;�Ԁ
��XX�<���E4@
-


-
-


	�


рz
-��
V�Ԁ
>�XX�<P
��E4?
-


-
-


	�


рz
-��
z�XX�<P
��E4?
-


-
-


	�


рz
-��
��XX�<P
��E4?
+�r
��Ԁ
��XX�<���E4@
 


 
-


	�


рz
-��
��XX�<P
��E4?
+


	�

	�z
+��
��Ԁ
i�XX�<P
��E4?
 


 
-


	�


рz
-��
��Ԁ
��((�<`
��E	8
-



-


-�
	
�
��
-�g
��Ԁ
��	Ԁ
s�	pp�<p
��EL
+


	�

	�z
+��
��	Ԁ
s�	pp�<`
��EL
 8
 



 


 �
	�
��
-Y�
��	Ԁ
Ѫ	XX�<���E4@
-


-
-


	�

��z
-aY
��	Ԁ
Y�	XX�<�
��E4?
-


-
-


	�

��z
-aY
�	Ԁ
�	((�<�
��E8
-



-


-�
	�
��
-Y�
�	Ԁ
A�Ԁ
��pp�<�
��EL8
-



-


-�
	�
��
-�a
˒Ԁ
�XX�<���E4@
+Y�
��	Ԁ
Ѫ	XX�<���E4@
 


 
-


	�

��z
-��
�Ԁ
��XX�<�
��E4?
+


	�

	�~�
+aY
��	Ԁ
k�	XX�<p
��E4?
 


 
-


	�

��z
-��
�XX�<�
��E4?
-


-
-


	�

��z
-��
"�Ԁ
<�((�<�
��E
8
-



-


-�
	�
��
-�a
L�Ԁ
�w
Ԁ
{
pp�<�
��EL8
-



-


-�
	q
��
-S�
{
Ԁ
a{
XX�<���E4@
-


-
-


	�

��z
-[S
.|
Ԁ
}
XX�<�
��E4?
-


-
-


	�

��z
-[S

~
XX�<�
��E4?
-


-
-


	�

��z
-[S
5�
XX�<�
��E4?
-


-
-


	�

��z
-[S
�
XX�<�
��E4?
-


-
-


	�

��z
-[S
A�
Ԁ
[�
((�<�
��E8
-



-


-�
	�
��
-S�
k�
Ԁ�Ԁ!pp�<��EL8
-



-


-�
	Y
��
-�[!Ԁi!XX�<���E4@
-


-
-


	�

q�z
-��6"Ԁ�"XX�<��E4?
-


-
-


	�

q�z
-��?$XX�<��E4?
-


-
-


	�

q�z
-��'XX�<��E4?
-


-
-


	�

q�z
-�� *XX�<��E4?
-


-
-


	�

q�z
-��$0XX�<��E4?
-


-
-


	�

q�z
-���8Ԁ�;((�< ��E8
-



-


-�
	q
��
-�[�;Ԁ�>TT����������E0

+


	�

	�~�
+aY@�TT����������E0

 


 
 

���
 


 
 


-��L
TT�������0��E0

+���TT��������
��E0

 

	
 

���
 

	
-

	��R@@�<@��

-

	
-

�S@@�<@��

-

	
-

V@@�<@��

+

	��@@�<�
��

 

	
-

WZԀ:aԀ�u@@�������P��


+

a�Ԁ�@@��������
��


 

	������
 


-v@@�<���

+�@@�<���

 


 
-

	�vԀ,zpp�<`��EL8
+

	�ԀA pp�<�
��EL8
 



 


-�
	A
��
-M�<zԀ�}((�<p��E8
-



-


-�
	!Y
��
-M��}Ԁ�@@����������


+�
		�
��
+	\aQ Ԁ�7@@����������


 


 ������
-

	�@@�<���

+

	�8@@�<�
��

 

	
 


-��Ԁr�XX�<
��E4	@
+�8ԀQ9XX�<���E4@
 


 
-


	�

!Y�z
-rM?�Ԁ��@@����������


+


	�


р~�
+	�	\:Ԁz]@@��������
��


 

	������
-

ʜԀ��XX�<���E4	?
+

I^Ԁ
_XX�<�
��E4?
 


 
-


	�

!Y�z
-rM!�Ԁ��pp�<���EL8
+


	�


р~�
+	�	\�>ԀZLpp�<�
��EL8
 



 


-�
	#)
��
-�r��Ԁ��XX�<
��E4
-@
-


-
-


	�

%A�z
-����Ԁ��XX�<���E4
-?
-


-
-


	�

%A�z
-����XX�<���E4
-?
-


-
-


	�

%A�z
-��|�XX�<���E4
-?
-


-
-


	�

%A�z
-��{�XX�<���E4
-?
-


-
-


	�

%A�z
-��EXX�<���E4
-?
-


-
-


	�

%A�z
-��
-Ԁ�XX�<���E4
-?
-


-
-


	�

%A�z
-��((�<���E8
-



-


-�
	%A
��
-�r Ԁi�Ԁ��pp�<���EL8
-



-


-�
	'
��
-	G���ԀA�XX�< 
��E4@
-


-
-


	�

))�z
-	O	G�Ԁ5�XX�<���E4?
-


-
-


	�

))�z
-	O	G�XX�<���E4?
-


-
-


	�

))�z
-	O	G��XX�<���E4?
-


-
-


	�

))�z
-	O	G��Ԁ��((�<��E8
-



-


-�
	))
��
-	G���Ԁ��Ԁ+�pp�<��EL8
-



-


-�
	*�
��
-	�	O;�Ԁ��XX�<0
��E4@
-


-
-


	�

-�z
-	�	�V�Ԁt�XX�< ��E4?
-


-
-


	�

-�z
-	�	���XX�< ��E4?
-


-
-


	�

-�z
-	�	�"�XX�< ��E4?
-


-
-


	�

-�z
-	�	�M�Ԁg�((�<0��E8
-



-


-�
	-
��
-	�	Ow�Ԁ��	Ԁs�	pp�<@��EL8
-



-


-�
	.�
��
-
-A	���	ԀѪ	XX�<@
��E4
@
-


-
-


	�

0��z
-
-I
-A��	Ԁ��	XX�<P��E4
?
-


-
-


	�

0��z
-
-I
-AI�	XX�<P��E4
?
-


-
-


	�

0��z
-
-I
-A��	XX�<P��E4
?
-


-
-


	�

0��z
-
-I
-A3�	XX�<P��E4
?
-


-
-


	�

0��z
-
-I
-A1�	XX�<P��E4
?
-


-
-


	�

0��z
-
-I
-AϿ	Ԁ��	((�<`��E8
-



-


-�
	0�
��
-
-A	���	ԀA�Ԁ��pp�<p��EL8
-



-


-�
	2�
��
-
-�
-I˒Ԁ�XX�<P
��E4@
-


-
-


	�

4�z
-
-�
-��Ԁ��XX�<���E4?
-


-
-


	�

4�z
-
-�
-��XX�<���E4?
-


-
-


	�

4�z
-
-�
-�T�XX�<���E4?
-


-
-


	�

4�z
-
-�
-��XX�<���E4?
-


-
-


	�

4�z
-
-�
-�n�Ԁ��((�<���E8
-



-


-�
	4�
��
-
-�
-I��Ԁ�w
Ԁ{
pp�<���EL8
-



-


-�
	6�
��
-;
-�{
Ԁa{
XX�<`
��E4@
+�
	
�
��
+	�	�jLԀ�LXX�<���E4@
 


 
-


	�

8ɀz
-C;.|
Ԁ}
XX�<���E4?
+


	�

��
+	�	��MԀ�NXX�<��E4?
 


 
-


	�

8ɀz
-C;��
Ԁъ
((�<���E8
-



-


-�
	8�
��
-;
-��
Ԁ
\ No newline at end of file
+


	�

��
+	�	�
\ No newline at end of file
diff -Naur ns-3.22/src/aodv/test/udp-chain-test-0-0.pcap ns-3.23/src/aodv/test/udp-chain-test-0-0.pcap
--- ns-3.22/src/aodv/test/udp-chain-test-0-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/udp-chain-test-0-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,84 +1,84 @@
-��i87TT�������
+��i�.TT�������		��E0

+



+

���
+



+


��H
TT�������
 
 ��E0

 


 

���
 


-

�HqTT�������		��E0

+

�
�TT�������		��E0


 



 

���
 



-


�
H^TT�������
+


�
xP
TT�������
 
 ��E0


 


 

���
 


-

�
ЄTT�������		��E0


-



-

���
-



-


�
��
XX�������		 ��E4

+

�
�
XX�������		 ��E4

 



 

��� 
(

 


 
-




HXX�������
+




�XX�������
 
  ��E4

 


 

��� 
(


 


 
-




n@@�<
+




��@@�<
 
 0��

 
 


-


�oԀ
ݒ@@�������
+


�Ԁ
��@@�������
 
 @��


 
 

������
-



��@@�<
+



�@@�<
 		0��
	
 



 
-


��Ԁ	
��TT�<	
+


��Ԁ	
��TT�<	
 
 P��E0

 


 


��
 


 
-



��Ԁ
-
��@@�������		@��

	
+


C
��Ԁ
+

�@@�������		@��

	
 


������
-


��@@�<	
+


j�@@�<	
 
 `��

 
 

	
-



�Ԁ
-
_�((�<
+



z�Ԁ
+
��((�<
 		P��E@
 



 


-�
	�
@�Ԁ	
��((�<
-		`��E
@
-



-


-�
	�
p�Ԁ	
��@@�������
+�
	�
��Ԁ	
��@@�������
 
 p��


 
 

������
-


k�Ԁ
C�((�<
+


|�Ԁ
T�((�<
 
 ���E?
 



 


-�
	�
|�((�<
+�
	�
��((�<
+		`��E
@
+



+


+�
	�
p�Ԁ	
6�((�<
 
 ���E
?
 



@@ -146,34 +146,34 @@
 
��E?
 



 


-�
	���
TT�������		���E0

+�
	�g�
TT�������		���E0

 



 

���
 




-


���
TT�������
+


��
TT�������
 
 
��E0

 


 

���
 


-

�x�@@�������		���

	
+

���@@�������		���

	
 


������
-

z�@@�<	
+

��@@�<	
 
  
��

 
 

	
-


��Ԁ
-D�((�<
+


��Ԁ
+��((�<
 		
��E	@
 



 


-�
	�%�Ԁ	��@@�������
+�
	�e�Ԁ	�@@�������
 
 0
��


 
 

������
-

��Ԁ��((�<
+

�Ԁ�!((�<
 
 @
��E	?
 



diff -Naur ns-3.22/src/aodv/test/udp-chain-test-9-0.pcap ns-3.23/src/aodv/test/udp-chain-test-9-0.pcap
--- ns-3.22/src/aodv/test/udp-chain-test-9-0.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/aodv/test/udp-chain-test-9-0.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,53 +1,53 @@
-��i�YTT���������E0

+��i��TT���������E0

 


 
 

���
 


 
 


-���
TT���������E0

+���TT���������E0

 

	
 

���
 

	
-

	�
�:TT���������E0


+

	�
(�TT���������E0


 


 
 

���
 


 
 


-�
@�
TT���������E0


+�
H�TT���������E0


 

	
 

���
 

	
-

	�
Ӥ@@������� ��


-

	������
-


��Ԁ
��TT�<0��E0

-

	
-

��@

-


-
-



s�@@�������@��


+

	�
�f@@������� ��


 

	������
 


-
��@@�< ��

+
�f@@�< ��

 


 
-

	
B�Ԁ
��TT�<P��E0

+

	
fgԀ
jhTT�<0��E0

 

	
 


 ��
 




 


-_
�Ԁ
��@@�<`��

+_
zhԀ
v@@�������@��


+

	������
+


�vԀ
�wTT�<P��E0

+

	
+

��@

+


+
+


C
��@@�<`��

 

	
-


�Ԁ
��Ԁ
Ë((�<p��E8
+


*�Ԁ
�WԀ
v]((�<p��E8
 



 


-�
	�
ӋԀ
q�Ԁ
7�((�<���E
8
+�
	�
�]Ԁ
�Ԁ
G((�<���E
8
 



 


-�
	�
G�Ԁ
��Ԁ
��((�<���E8
+�
	�
WԀ
��Ԁ
��((�<���E8
 



 


 �
	�
��Ԁ
�Ԁ
��((�<���E8
@@ -65,36 +65,37 @@
 �
	�
��
Ԁ�/Ԁ�5((�<���E8
 



 


-�
	��5Ԁ6TT�������0��E0

+�
	��5Ԁ@�TT�������0��E0

 


 
 

���
 


 
 


-���
TT����������E0

+���TT����������E0

 

	
 

���
 

	
 

	�9Ԁ�((�<
��E8
 



 


-�
	�Ԁg>@@�<
��

+�
	�Ԁw�@@�<
��

 

	
-

�DԀ�T@@������� 
��


+

��Ԁ<�@@������� 
��


 

	������
 


-�T@@�<@��

+^�@@�<@��

 


 
-

	uUԀq[((�<0
��E	8
+

	
+�Ԁ�((�<0
��E	8
 



 


-�
	��[Ԁ�3Ԁ�9((�<@
��E
+�
	��Ԁ��Ԁ��((�<@
��E
 8
 



 


-�
	��9Ԁ�Ԁ��((�<P
��E8
+�
	���Ԁ�Ԁ��((�<P
��E8
 



 


 �
	���ԀY�	Ԁ�	((�<`
��E8
diff -Naur ns-3.22/src/applications/bindings/modulegen__gcc_ILP32.py ns-3.23/src/applications/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/applications/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -1721,11 +1721,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/applications/bindings/modulegen__gcc_LP64.py ns-3.23/src/applications/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/applications/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -1721,11 +1721,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/applications/model/application-packet-probe.cc ns-3.23/src/applications/model/application-packet-probe.cc
--- ns-3.22/src/applications/model/application-packet-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/application-packet-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::ApplicationPacketProbe")
     .SetParent<Probe> ()
+    .SetGroupName("Applications")
     .AddConstructor<ApplicationPacketProbe> ()
     .AddTraceSource ( "Output",
                       "The packet plus its socket address that serve "
diff -Naur ns-3.22/src/applications/model/bulk-send-application.cc ns-3.23/src/applications/model/bulk-send-application.cc
--- ns-3.22/src/applications/model/bulk-send-application.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/bulk-send-application.cc	2015-05-13 11:05:27.000000000 -0700
@@ -42,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::BulkSendApplication")
     .SetParent<Application> ()
+    .SetGroupName("Applications") 
     .AddConstructor<BulkSendApplication> ()
     .AddAttribute ("SendSize", "The amount of data to send each time.",
                    UintegerValue (512),
@@ -224,7 +225,7 @@
 
   if (m_connected)
     { // Only send new data if the connection has completed
-      Simulator::ScheduleNow (&BulkSendApplication::SendData, this);
+      SendData ();
     }
 }
 
diff -Naur ns-3.22/src/applications/model/onoff-application.cc ns-3.23/src/applications/model/onoff-application.cc
--- ns-3.22/src/applications/model/onoff-application.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/onoff-application.cc	2015-05-13 11:05:27.000000000 -0700
@@ -53,6 +53,7 @@
 {
   static TypeId tid = TypeId ("ns3::OnOffApplication")
     .SetParent<Application> ()
+    .SetGroupName("Applications")
     .AddConstructor<OnOffApplication> ()
     .AddAttribute ("DataRate", "The data rate in on state.",
                    DataRateValue (DataRate ("500kb/s")),
diff -Naur ns-3.22/src/applications/model/packet-sink.cc ns-3.23/src/applications/model/packet-sink.cc
--- ns-3.22/src/applications/model/packet-sink.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/packet-sink.cc	2015-05-13 11:05:27.000000000 -0700
@@ -43,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::PacketSink")
     .SetParent<Application> ()
+    .SetGroupName("Applications")
     .AddConstructor<PacketSink> ()
     .AddAttribute ("Local",
                    "The Address on which to Bind the rx socket.",
diff -Naur ns-3.22/src/applications/model/ping6.cc ns-3.23/src/applications/model/ping6.cc
--- ns-3.22/src/applications/model/ping6.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/ping6.cc	2015-05-13 11:05:27.000000000 -0700
@@ -46,6 +46,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ping6")
     .SetParent<Application>()
+    .SetGroupName("Applications")
     .AddConstructor<Ping6>()
     .AddAttribute ("MaxPackets", 
                    "The maximum number of packets the application will send",
diff -Naur ns-3.22/src/applications/model/radvd.cc ns-3.23/src/applications/model/radvd.cc
--- ns-3.22/src/applications/model/radvd.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/radvd.cc	2015-05-13 11:05:27.000000000 -0700
@@ -52,6 +52,7 @@
 {
   static TypeId tid = TypeId ("ns3::Radvd")
     .SetParent<Application> ()
+    .SetGroupName("Applications")
     .AddConstructor<Radvd> ()
     .AddAttribute ("AdvertisementJitter",
                    "Uniform variable to provide jitter between min and max values of AdvInterval",
diff -Naur ns-3.22/src/applications/model/seq-ts-header.cc ns-3.23/src/applications/model/seq-ts-header.cc
--- ns-3.22/src/applications/model/seq-ts-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/seq-ts-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -62,6 +62,7 @@
 {
   static TypeId tid = TypeId ("ns3::SeqTsHeader")
     .SetParent<Header> ()
+    .SetGroupName("Applications")
     .AddConstructor<SeqTsHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/applications/model/udp-client.cc ns-3.23/src/applications/model/udp-client.cc
--- ns-3.22/src/applications/model/udp-client.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/udp-client.cc	2015-05-13 11:05:27.000000000 -0700
@@ -44,6 +44,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpClient")
     .SetParent<Application> ()
+    .SetGroupName("Applications")
     .AddConstructor<UdpClient> ()
     .AddAttribute ("MaxPackets",
                    "The maximum number of packets the application will send",
diff -Naur ns-3.22/src/applications/model/udp-echo-client.cc ns-3.23/src/applications/model/udp-echo-client.cc
--- ns-3.22/src/applications/model/udp-echo-client.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/udp-echo-client.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpEchoClient")
     .SetParent<Application> ()
+    .SetGroupName("Applications")
     .AddConstructor<UdpEchoClient> ()
     .AddAttribute ("MaxPackets", 
                    "The maximum number of packets the application will send",
diff -Naur ns-3.22/src/applications/model/udp-echo-server.cc ns-3.23/src/applications/model/udp-echo-server.cc
--- ns-3.22/src/applications/model/udp-echo-server.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/udp-echo-server.cc	2015-05-13 11:05:27.000000000 -0700
@@ -43,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpEchoServer")
     .SetParent<Application> ()
+    .SetGroupName("Applications")
     .AddConstructor<UdpEchoServer> ()
     .AddAttribute ("Port", "Port on which we listen for incoming packets.",
                    UintegerValue (9),
diff -Naur ns-3.22/src/applications/model/udp-server.cc ns-3.23/src/applications/model/udp-server.cc
--- ns-3.22/src/applications/model/udp-server.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/udp-server.cc	2015-05-13 11:05:27.000000000 -0700
@@ -46,6 +46,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpServer")
     .SetParent<Application> ()
+    .SetGroupName("Applications")
     .AddConstructor<UdpServer> ()
     .AddAttribute ("Port",
                    "Port on which we listen for incoming packets.",
diff -Naur ns-3.22/src/applications/model/udp-trace-client.cc ns-3.23/src/applications/model/udp-trace-client.cc
--- ns-3.22/src/applications/model/udp-trace-client.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/udp-trace-client.cc	2015-05-13 11:05:27.000000000 -0700
@@ -62,6 +62,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpTraceClient")
     .SetParent<Application> ()
+    .SetGroupName("Applications")
     .AddConstructor<UdpTraceClient> ()
     .AddAttribute ("RemoteAddress",
                    "The destination Address of the outbound packets",
diff -Naur ns-3.22/src/applications/model/v4ping.cc ns-3.23/src/applications/model/v4ping.cc
--- ns-3.22/src/applications/model/v4ping.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/applications/model/v4ping.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::V4Ping")
     .SetParent<Application> ()
+    .SetGroupName("Applications")
     .AddConstructor<V4Ping> ()
     .AddAttribute ("Remote", 
                    "The address of the machine we want to ping.",
diff -Naur ns-3.22/src/bridge/model/bridge-channel.cc ns-3.23/src/bridge/model/bridge-channel.cc
--- ns-3.22/src/bridge/model/bridge-channel.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/bridge/model/bridge-channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::BridgeChannel")
     .SetParent<Channel> ()
+    .SetGroupName("Bridge")
     .AddConstructor<BridgeChannel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/bridge/model/bridge-net-device.cc ns-3.23/src/bridge/model/bridge-net-device.cc
--- ns-3.22/src/bridge/model/bridge-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/bridge/model/bridge-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -36,6 +36,7 @@
 {
   static TypeId tid = TypeId ("ns3::BridgeNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName("Bridge")
     .AddConstructor<BridgeNetDevice> ()
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (1500),
@@ -398,11 +399,13 @@
 
   // data was not unicast or no state has been learned for that mac
   // address => flood through all ports.
+  Ptr<Packet> pktCopy;
   for (std::vector< Ptr<NetDevice> >::iterator iter = m_ports.begin ();
        iter != m_ports.end (); iter++)
     {
+      pktCopy = packet->Copy ();
       Ptr<NetDevice> port = *iter;
-      port->SendFrom (packet, src, dest, protocolNumber);
+      port->SendFrom (pktCopy, src, dest, protocolNumber);
     }
 
   return true;
diff -Naur ns-3.22/src/buildings/helper/building-allocator.cc ns-3.23/src/buildings/helper/building-allocator.cc
--- ns-3.22/src/buildings/helper/building-allocator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/buildings/helper/building-allocator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -51,6 +51,7 @@
   static TypeId tid = TypeId ("ns3::GridBuildingAllocator")
     .SetParent<Object> ()
     .AddConstructor<GridBuildingAllocator> ()
+    .SetGroupName ("Buildings")
     .AddAttribute ("GridWidth", "The number of objects layed out on a line.",
                    UintegerValue (10),
                    MakeUintegerAccessor (&GridBuildingAllocator::m_n),
diff -Naur ns-3.22/src/buildings/helper/building-position-allocator.cc ns-3.23/src/buildings/helper/building-position-allocator.cc
--- ns-3.22/src/buildings/helper/building-position-allocator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/buildings/helper/building-position-allocator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -50,7 +50,7 @@
 {
   static TypeId tid = TypeId ("ns3::RandomBuildingPositionAllocator")
     .SetParent<PositionAllocator> ()
-    .SetGroupName ("Mobility")
+    .SetGroupName ("Buildings")
     .AddConstructor<RandomBuildingPositionAllocator> ()
     .AddAttribute ("WithReplacement",
                    "If true, the building will be randomly selected with replacement. "
@@ -117,7 +117,7 @@
 {
   static TypeId tid = TypeId ("ns3::RandomRoomPositionAllocator")
     .SetParent<PositionAllocator> ()
-    .SetGroupName ("Mobility")
+    .SetGroupName ("Buildings")
     .AddConstructor<RandomRoomPositionAllocator> ();
   return tid;
 }
@@ -221,7 +221,7 @@
 {
   static TypeId tid = TypeId ("ns3::SameRoomPositionAllocator")
     .SetParent<PositionAllocator> ()
-    .SetGroupName ("Mobility")
+    .SetGroupName ("Buildings")
     .AddConstructor<SameRoomPositionAllocator> ();
   return tid;
 }
@@ -303,7 +303,7 @@
 {
   static TypeId tid = TypeId ("ns3::FixedRoomPositionAllocator")
     .SetParent<PositionAllocator> ()
-    .SetGroupName ("Mobility")
+    .SetGroupName ("Buildings")
     .AddConstructor<SameRoomPositionAllocator> ();
   return tid;
 }
diff -Naur ns-3.22/src/buildings/model/building.cc ns-3.23/src/buildings/model/building.cc
--- ns-3.22/src/buildings/model/building.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/buildings/model/building.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
   static TypeId tid = TypeId ("ns3::Building")
     .SetParent<Object> ()
     .AddConstructor<Building> ()
+    .SetGroupName ("Buildings")
     .AddAttribute ("NRoomsX", "The number of rooms in the X axis.",
                    UintegerValue (1),
                    MakeUintegerAccessor (&Building::GetNRoomsX, &Building::SetNRoomsX),
diff -Naur ns-3.22/src/buildings/model/building-list.cc ns-3.23/src/buildings/model/building-list.cc
--- ns-3.22/src/buildings/model/building-list.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/buildings/model/building-list.cc	2015-05-13 11:05:27.000000000 -0700
@@ -64,6 +64,7 @@
 {
   static TypeId tid = TypeId ("ns3::BuildingListPriv")
     .SetParent<Object> ()
+    .SetGroupName ("Buildings")
     .AddAttribute ("BuildingList", "The list of all buildings created during the simulation.",
                    ObjectVectorValue (),
                    MakeObjectVectorAccessor (&BuildingListPriv::m_buildings),
diff -Naur ns-3.22/src/buildings/model/buildings-propagation-loss-model.cc ns-3.23/src/buildings/model/buildings-propagation-loss-model.cc
--- ns-3.22/src/buildings/model/buildings-propagation-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/buildings/model/buildings-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -65,6 +65,7 @@
   static TypeId tid = TypeId ("ns3::BuildingsPropagationLossModel")
 
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Buildings")
 
 
     .AddAttribute ("ShadowSigmaOutdoor",
diff -Naur ns-3.22/src/buildings/model/hybrid-buildings-propagation-loss-model.cc ns-3.23/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
--- ns-3.22/src/buildings/model/hybrid-buildings-propagation-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/buildings/model/hybrid-buildings-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -66,6 +66,7 @@
     .SetParent<BuildingsPropagationLossModel> ()
     
     .AddConstructor<HybridBuildingsPropagationLossModel> ()
+    .SetGroupName ("Buildings")
     
     .AddAttribute ("Frequency",
                    "The Frequency  (default is 2.106 GHz).",
diff -Naur ns-3.22/src/buildings/model/itu-r-1238-propagation-loss-model.cc ns-3.23/src/buildings/model/itu-r-1238-propagation-loss-model.cc
--- ns-3.22/src/buildings/model/itu-r-1238-propagation-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/buildings/model/itu-r-1238-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
   static TypeId tid = TypeId ("ns3::ItuR1238PropagationLossModel")
 
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Buildings")
 
     .AddAttribute ("Frequency",
                    "The Frequency  (default is 2.106 GHz).",
diff -Naur ns-3.22/src/buildings/model/mobility-building-info.cc ns-3.23/src/buildings/model/mobility-building-info.cc
--- ns-3.22/src/buildings/model/mobility-building-info.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/buildings/model/mobility-building-info.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,7 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::MobilityBuildingInfo")
     .SetParent<Object> ()
-    .SetGroupName ("Building")
+    .SetGroupName ("Buildings")
     .AddConstructor<MobilityBuildingInfo> ();
 
   return tid;
diff -Naur ns-3.22/src/buildings/model/oh-buildings-propagation-loss-model.cc ns-3.23/src/buildings/model/oh-buildings-propagation-loss-model.cc
--- ns-3.22/src/buildings/model/oh-buildings-propagation-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/buildings/model/oh-buildings-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -54,6 +54,7 @@
   static TypeId tid = TypeId ("ns3::OhBuildingsPropagationLossModel")
   
   .SetParent<BuildingsPropagationLossModel> ()
+  .SetGroupName ("Buildings")
   
   .AddConstructor<OhBuildingsPropagationLossModel> ();
   
diff -Naur ns-3.22/src/click/model/ipv4-click-routing.cc ns-3.23/src/click/model/ipv4-click-routing.cc
--- ns-3.22/src/click/model/ipv4-click-routing.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/click/model/ipv4-click-routing.cc	2015-05-13 11:05:27.000000000 -0700
@@ -55,6 +55,7 @@
   static TypeId tid = TypeId ("ns3::Ipv4ClickRouting")
     .SetParent<Ipv4RoutingProtocol> ()
     .AddConstructor<Ipv4ClickRouting> ()
+    .SetGroupName ("Click")
   ;
 
   return tid;
diff -Naur ns-3.22/src/click/model/ipv4-l3-click-protocol.cc ns-3.23/src/click/model/ipv4-l3-click-protocol.cc
--- ns-3.22/src/click/model/ipv4-l3-click-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/click/model/ipv4-l3-click-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -52,6 +52,7 @@
   static TypeId tid = TypeId ("ns3::Ipv4L3ClickProtocol")
     .SetParent<Ipv4> ()
     .AddConstructor<Ipv4L3ClickProtocol> ()
+    .SetGroupName ("Click")
     .AddAttribute ("DefaultTtl", "The TTL value set by default on all outgoing packets generated on this node.",
                    UintegerValue (64),
                    MakeUintegerAccessor (&Ipv4L3ClickProtocol::m_defaultTtl),
diff -Naur ns-3.22/src/config-store/model/config-store.cc ns-3.23/src/config-store/model/config-store.cc
--- ns-3.22/src/config-store/model/config-store.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/config-store/model/config-store.cc	2015-05-13 11:05:27.000000000 -0700
@@ -29,6 +29,7 @@
 {
   static TypeId tid = TypeId ("ns3::ConfigStore")
     .SetParent<ObjectBase> ()
+    .SetGroupName ("ConfigStore")
     .AddAttribute ("Mode", 
                    "Configuration mode",
                    EnumValue (ConfigStore::NONE),
diff -Naur ns-3.22/src/core/bindings/modulegen__gcc_ILP32.py ns-3.23/src/core/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/core/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -3926,10 +3926,10 @@
     cls.add_constructor([param('ns3::RealtimeSimulatorImpl const &', 'arg0')])
     ## realtime-simulator-impl.h (module 'core'): ns3::RealtimeSimulatorImpl::RealtimeSimulatorImpl() [constructor]
     cls.add_constructor([])
-    ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Cancel(ns3::EventId const & id) [member function]
+    ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Cancel(ns3::EventId const & ev) [member function]
     cls.add_method('Cancel', 
                    'void', 
-                   [param('ns3::EventId const &', 'id')], 
+                   [param('ns3::EventId const &', 'ev')], 
                    is_virtual=True)
     ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Destroy() [member function]
     cls.add_method('Destroy', 
@@ -3971,10 +3971,10 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## realtime-simulator-impl.h (module 'core'): bool ns3::RealtimeSimulatorImpl::IsExpired(ns3::EventId const & id) const [member function]
+    ## realtime-simulator-impl.h (module 'core'): bool ns3::RealtimeSimulatorImpl::IsExpired(ns3::EventId const & ev) const [member function]
     cls.add_method('IsExpired', 
                    'bool', 
-                   [param('ns3::EventId const &', 'id')], 
+                   [param('ns3::EventId const &', 'ev')], 
                    is_const=True, is_virtual=True)
     ## realtime-simulator-impl.h (module 'core'): bool ns3::RealtimeSimulatorImpl::IsFinished() const [member function]
     cls.add_method('IsFinished', 
@@ -3991,10 +3991,10 @@
                    'ns3::Time', 
                    [], 
                    is_const=True)
-    ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Remove(ns3::EventId const & id) [member function]
+    ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Remove(ns3::EventId const & ev) [member function]
     cls.add_method('Remove', 
                    'void', 
-                   [param('ns3::EventId const &', 'id')], 
+                   [param('ns3::EventId const &', 'ev')], 
                    is_virtual=True)
     ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Run() [member function]
     cls.add_method('Run', 
diff -Naur ns-3.22/src/core/bindings/modulegen__gcc_LP64.py ns-3.23/src/core/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/core/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -3926,10 +3926,10 @@
     cls.add_constructor([param('ns3::RealtimeSimulatorImpl const &', 'arg0')])
     ## realtime-simulator-impl.h (module 'core'): ns3::RealtimeSimulatorImpl::RealtimeSimulatorImpl() [constructor]
     cls.add_constructor([])
-    ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Cancel(ns3::EventId const & id) [member function]
+    ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Cancel(ns3::EventId const & ev) [member function]
     cls.add_method('Cancel', 
                    'void', 
-                   [param('ns3::EventId const &', 'id')], 
+                   [param('ns3::EventId const &', 'ev')], 
                    is_virtual=True)
     ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Destroy() [member function]
     cls.add_method('Destroy', 
@@ -3971,10 +3971,10 @@
                    'ns3::TypeId', 
                    [], 
                    is_static=True)
-    ## realtime-simulator-impl.h (module 'core'): bool ns3::RealtimeSimulatorImpl::IsExpired(ns3::EventId const & id) const [member function]
+    ## realtime-simulator-impl.h (module 'core'): bool ns3::RealtimeSimulatorImpl::IsExpired(ns3::EventId const & ev) const [member function]
     cls.add_method('IsExpired', 
                    'bool', 
-                   [param('ns3::EventId const &', 'id')], 
+                   [param('ns3::EventId const &', 'ev')], 
                    is_const=True, is_virtual=True)
     ## realtime-simulator-impl.h (module 'core'): bool ns3::RealtimeSimulatorImpl::IsFinished() const [member function]
     cls.add_method('IsFinished', 
@@ -3991,10 +3991,10 @@
                    'ns3::Time', 
                    [], 
                    is_const=True)
-    ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Remove(ns3::EventId const & id) [member function]
+    ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Remove(ns3::EventId const & ev) [member function]
     cls.add_method('Remove', 
                    'void', 
-                   [param('ns3::EventId const &', 'id')], 
+                   [param('ns3::EventId const &', 'ev')], 
                    is_virtual=True)
     ## realtime-simulator-impl.h (module 'core'): void ns3::RealtimeSimulatorImpl::Run() [member function]
     cls.add_method('Run', 
diff -Naur ns-3.22/src/core/model/assert.h ns-3.23/src/core/model/assert.h
--- ns-3.22/src/core/model/assert.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/assert.h	2015-05-13 11:05:27.000000000 -0700
@@ -22,6 +22,12 @@
 #define NS_ASSERT_H
 
 /**
+ * \file
+ * \ingroup assert
+ * Definition of assertion macros NS_ASSERT() and NS_ASSERT_MSG().
+ */
+
+/**
  * \ingroup debugging
  * \defgroup assert Assertions
  *
diff -Naur ns-3.22/src/core/model/breakpoint.cc ns-3.23/src/core/model/breakpoint.cc
--- ns-3.22/src/core/model/breakpoint.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/breakpoint.cc	2015-05-13 11:05:27.000000000 -0700
@@ -28,6 +28,12 @@
 
 namespace ns3 {
 
+/**
+ * \file
+ * \ingroup breakpoint
+ * ns3::BreakpointFallback function implementation.
+ */
+
 NS_LOG_COMPONENT_DEFINE ("Breakpoint");
 
 #if defined (HAVE_SIGNAL_H) && defined (SIGTRAP)
diff -Naur ns-3.22/src/core/model/breakpoint.h ns-3.23/src/core/model/breakpoint.h
--- ns-3.22/src/core/model/breakpoint.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/breakpoint.h	2015-05-13 11:05:27.000000000 -0700
@@ -21,6 +21,13 @@
 #ifndef BREAKPOINT_H
 #define BREAKPOINT_H
 
+/**
+ * \file
+ * \ingroup breakpoint
+ * Definition of NS_BREAKPOINT() macro and ns3::BreakpointFallback
+ * function declaration.
+ */
+
 namespace ns3 {
 
 /* Hacker macro to place breakpoints for selected machines.
diff -Naur ns-3.22/src/core/model/cairo-wideint.c ns-3.23/src/core/model/cairo-wideint.c
--- ns-3.22/src/core/model/cairo-wideint.c	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/cairo-wideint.c	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,12 @@
 
 #include "cairo-wideint-private.h"
 
+/**
+ * \file
+ * \ingroup highprec
+ * Implementation of the cairo_x functions which implement high precision arithmetic.
+ */
+
 #if HAVE_UINT64_T
 
 const char * cairo_impl64 = "uint64_t";
diff -Naur ns-3.22/src/core/model/cairo-wideint-private.h ns-3.23/src/core/model/cairo-wideint-private.h
--- ns-3.22/src/core/model/cairo-wideint-private.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/cairo-wideint-private.h	2015-05-13 11:05:27.000000000 -0700
@@ -32,6 +32,12 @@
 #ifndef CAIRO_WIDEINT_H
 #define CAIRO_WIDEINT_H
 
+/**
+ * \file
+ * \ingroup highprec
+ * Declaration of the cairo_x functions which implement high precision arithmetic.
+ */
+
 // Adapt to ns-3 environment
 #include "ns3/core-config.h"
 #define cairo_private 
diff -Naur ns-3.22/src/core/model/calendar-scheduler.cc ns-3.23/src/core/model/calendar-scheduler.cc
--- ns-3.22/src/core/model/calendar-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/calendar-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -26,6 +26,12 @@
 #include "assert.h"
 #include "log.h"
 
+/**
+ * \file
+ * \ingroup scheduler
+ * Implementation of ns3::CalendarScheduler class.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("CalendarScheduler");
@@ -37,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::CalendarScheduler")
     .SetParent<Scheduler> ()
+    .SetGroupName ("Core")
     .AddConstructor<CalendarScheduler> ()
   ;
   return tid;
diff -Naur ns-3.22/src/core/model/calendar-scheduler.h ns-3.23/src/core/model/calendar-scheduler.h
--- ns-3.22/src/core/model/calendar-scheduler.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/calendar-scheduler.h	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,12 @@
 #include <stdint.h>
 #include <list>
 
+/**
+ * \file
+ * \ingroup scheduler
+ * Declaration of ns3::CalendarScheduler class.
+ */
+
 namespace ns3 {
 
 class EventImpl;
diff -Naur ns-3.22/src/core/model/callback.h ns-3.23/src/core/model/callback.h
--- ns-3.22/src/core/model/callback.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/callback.h	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,12 @@
 #include "simple-ref-count.h"
 #include <typeinfo>
 
+/**
+ * \file
+ * \ingroup callback
+ * Declaration of the various callback functions.
+ */
+
 namespace ns3 {
 
 // Define the doxygen subgroups all at once,
diff -Naur ns-3.22/src/core/model/config.cc ns-3.23/src/core/model/config.cc
--- ns-3.22/src/core/model/config.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/config.cc	2015-05-13 11:05:27.000000000 -0700
@@ -28,6 +28,12 @@
 
 #include <sstream>
 
+/**
+ * \file
+ * \ingroup config
+ * Imlementation of the various ns3::Config functions and classes.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("Config");
diff -Naur ns-3.22/src/core/model/config.h ns-3.23/src/core/model/config.h
--- ns-3.22/src/core/model/config.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/config.h	2015-05-13 11:05:27.000000000 -0700
@@ -24,6 +24,12 @@
 #include <string>
 #include <vector>
 
+/**
+ * \file
+ * \ingroup config
+ * Declaration of the various ns3::Config functions and classes.
+ */
+
 namespace ns3 {
 
 class AttributeValue;
@@ -31,18 +37,26 @@
 class CallbackBase;
 
 /**
- * \brief Configuration of simulation parameters and tracing
  * \ingroup core
+ * \defgroup config Configuration
+ * \brief Configuration of simulation parameters and tracing.
+ */
+
+/**
+ * \ingroup config
+ * Namespace for the various functions implementing the Config system.
  */
 namespace Config {
 
 /**
+ * \ingroup config
  * Reset the initial value of every attribute as well as the value of every
  * global to what they were before any call to SetDefault and SetGlobal.
  */
 void Reset (void);
 
 /**
+ * \ingroup config
  * \param path a path to match attributes.
  * \param value the value to set in all matching attributes.
  *
@@ -52,6 +66,7 @@
  */
 void Set (std::string path, const AttributeValue &value);
 /**
+ * \ingroup config
  * \param name the full name of the attribute
  * \param value the value to set.
  *
@@ -61,6 +76,7 @@
  */
 void SetDefault (std::string name, const AttributeValue &value);
 /**
+ * \ingroup config
  * \param name the full name of the attribute
  * \param value the value to set.
  * \returns true if the value was set successfully, false otherwise.
@@ -70,6 +86,7 @@
  */
 bool SetDefaultFailSafe (std::string name, const AttributeValue &value);
 /**
+ * \ingroup config
  * \param name the name of the requested GlobalValue.
  * \param value the value to set
  *
@@ -77,6 +94,7 @@
  */
 void SetGlobal (std::string name, const AttributeValue &value);
 /**
+ * \ingroup config
  * \param name the name of the requested GlobalValue.
  * \param value the value to set
  *
@@ -84,6 +102,7 @@
  */
 bool SetGlobalFailSafe (std::string name, const AttributeValue &value);
 /**
+ * \ingroup config
  * \param path a path to match trace sources.
  * \param cb the callback to connect to the matching trace sources.
  *
@@ -93,6 +112,7 @@
  */
 void ConnectWithoutContext (std::string path, const CallbackBase &cb);
 /**
+ * \ingroup config
  * \param path a path to match trace sources.
  * \param cb the callback to disconnect to the matching trace sources.
  *
@@ -100,6 +120,7 @@
  */
 void DisconnectWithoutContext (std::string path, const CallbackBase &cb);
 /**
+ * \ingroup config
  * \param path a path to match trace sources.
  * \param cb the callback to connect to the matching trace sources.
  *
@@ -110,6 +131,7 @@
  */
 void Connect (std::string path, const CallbackBase &cb);
 /**
+ * \ingroup config
  * \param path a path to match trace sources.
  * \param cb the callback to connect to the matching trace sources.
  *
@@ -118,6 +140,7 @@
 void Disconnect (std::string path, const CallbackBase &cb);
 
 /**
+ * \ingroup config
  * \brief hold a set of objects which match a specific search string.
  *
  * This class also allows you to perform a set of configuration operations
@@ -216,6 +239,7 @@
 };
 
 /**
+ * \ingroup config
  * \param path the path to perform a match against
  * \returns a container which contains all the objects which match the input
  *          path.
@@ -223,6 +247,7 @@
 MatchContainer LookupMatches (std::string path);
 
 /**
+ * \ingroup config
  * \param obj a new root object
  *
  * Each root object is used during path matching as
@@ -230,6 +255,7 @@
  */
 void RegisterRootNamespaceObject (Ptr<Object> obj);
 /**
+ * \ingroup config
  * \param obj a new root object
  *
  * This function undoes the work of Config::RegisterRootNamespaceObject.
@@ -237,11 +263,13 @@
 void UnregisterRootNamespaceObject (Ptr<Object> obj);
 
 /**
+ * \ingroup config
  * \returns the number of registered root namespace objects.
  */
 uint32_t GetRootNamespaceObjectN (void);
 
 /**
+ * \ingroup config
  * \param i the index of the requested object.
  * \returns the requested root namespace object
  */
diff -Naur ns-3.22/src/core/model/default-simulator-impl.cc ns-3.23/src/core/model/default-simulator-impl.cc
--- ns-3.22/src/core/model/default-simulator-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/default-simulator-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -31,6 +31,12 @@
 #include <cmath>
 
 
+/**
+ * \file
+ * \ingroup simulator
+ * Implementation of class ns3::DefaultSimulatorImpl.
+ */
+
 namespace ns3 {
 
 // Note:  Logging in this file is largely avoided due to the
@@ -45,6 +51,7 @@
 {
   static TypeId tid = TypeId ("ns3::DefaultSimulatorImpl")
     .SetParent<SimulatorImpl> ()
+    .SetGroupName ("Core")
     .AddConstructor<DefaultSimulatorImpl> ()
   ;
   return tid;
diff -Naur ns-3.22/src/core/model/default-simulator-impl.h ns-3.23/src/core/model/default-simulator-impl.h
--- ns-3.22/src/core/model/default-simulator-impl.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/default-simulator-impl.h	2015-05-13 11:05:27.000000000 -0700
@@ -31,6 +31,12 @@
 
 #include <list>
 
+/**
+ * \file
+ * \ingroup simulator
+ * Declaration of class ns3::DefaultSimulatorImpl.
+ */
+
 namespace ns3 {
 
 /**
diff -Naur ns-3.22/src/core/model/deprecated.h ns-3.23/src/core/model/deprecated.h
--- ns-3.22/src/core/model/deprecated.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/deprecated.h	2015-05-13 11:05:27.000000000 -0700
@@ -1,6 +1,22 @@
 #ifndef NS3_DEPRECATED_H
 #define NS3_DEPRECATED_H
 
+/**
+ * \file
+ * \ingroup core
+ * Definition of the NS_DEPRECATED macro.
+ */
+
+/**
+ * \ingroup core
+ * \def NS_DEPRECATED
+ * Mark a function as deprecated.
+ *
+ * Users should expect deprecated features to be removed eventually.
+ *
+ * When deprecating a feature, please update the documentation
+ * with information for users on how to update their code.
+ */
 #if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ > 1)
 #define NS_DEPRECATED __attribute__ ((deprecated))
 #else
diff -Naur ns-3.22/src/core/model/empty.h ns-3.23/src/core/model/empty.h
--- ns-3.22/src/core/model/empty.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/empty.h	2015-05-13 11:05:27.000000000 -0700
@@ -20,6 +20,12 @@
 #ifndef EMPTY_H
 #define EMPTY_H
 
+/**
+ * \file
+ * \ingroup callback
+ * Definition of class ns3::empty, used by callbacks.
+ */
+
 namespace ns3 {
 /**
  * \brief make Callback use a separate empty type
diff -Naur ns-3.22/src/core/model/global-value.cc ns-3.23/src/core/model/global-value.cc
--- ns-3.22/src/core/model/global-value.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/global-value.cc	2015-05-13 11:05:27.000000000 -0700
@@ -29,6 +29,12 @@
 #include <cstdlib>
 #endif
 
+/**
+ * \file
+ * \ingroup core
+ * ns3::GlobalValue implementation.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("GlobalValue");
diff -Naur ns-3.22/src/core/model/global-value.h ns-3.23/src/core/model/global-value.h
--- ns-3.22/src/core/model/global-value.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/global-value.h	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,12 @@
 #include "ptr.h"
 #include "attribute.h"
 
+/**
+ * \file
+ * \ingroup core
+ * ns3::GlobalValue declaration.
+ */
+
 class GlobalValueTestCase;
 
 namespace ns3 {
diff -Naur ns-3.22/src/core/model/heap-scheduler.cc ns-3.23/src/core/model/heap-scheduler.cc
--- ns-3.22/src/core/model/heap-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/heap-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,12 @@
 #include "assert.h"
 #include "log.h"
 
+/**
+ * \file
+ * \ingroup scheduler
+ * Implementation of ns3::HeapScheduler class.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("HeapScheduler");
@@ -36,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::HeapScheduler")
     .SetParent<Scheduler> ()
+    .SetGroupName ("Core")
     .AddConstructor<HeapScheduler> ()
   ;
   return tid;
diff -Naur ns-3.22/src/core/model/heap-scheduler.h ns-3.23/src/core/model/heap-scheduler.h
--- ns-3.22/src/core/model/heap-scheduler.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/heap-scheduler.h	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,12 @@
 #include <stdint.h>
 #include <vector>
 
+/**
+ * \file
+ * \ingroup scheduler
+ * Declaration of ns3::HeapScheduler class.
+ */
+
 namespace ns3 {
 
 /**
diff -Naur ns-3.22/src/core/model/int64x64-128.cc ns-3.23/src/core/model/int64x64-128.cc
--- ns-3.22/src/core/model/int64x64-128.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/int64x64-128.cc	2015-05-13 11:05:27.000000000 -0700
@@ -22,6 +22,12 @@
 #include "assert.h"
 #include "log.h"
 
+/**
+ * \file
+ * \ingroup highprec
+ * Implementation of the ns3::int64x64_t type using a native int128_t type..
+ */
+
 namespace ns3 {
 
 // Note:  Logging in this file is largely avoided due to the
diff -Naur ns-3.22/src/core/model/int64x64-128.h ns-3.23/src/core/model/int64x64-128.h
--- ns-3.22/src/core/model/int64x64-128.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/int64x64-128.h	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,12 @@
 typedef __int128_t int128_t;
 #endif
 
+/**
+ * \file
+ * \ingroup highprec
+ * Declaration of the ns3::int64x64_t type using a native int128_t type..
+ */
+
 namespace ns3 {
 
 /**
diff -Naur ns-3.22/src/core/model/int64x64-cairo.cc ns-3.23/src/core/model/int64x64-cairo.cc
--- ns-3.22/src/core/model/int64x64-cairo.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/int64x64-cairo.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,12 @@
 #include "cairo-wideint.c"
 }
 
+/**
+ * \file
+ * \ingroup highprec
+ * Implementation of the ns3::int64x64_t type using the Cairo implementation.
+ */
+
 namespace ns3 {
 
 // Note:  Logging in this file is largely avoided due to the
diff -Naur ns-3.22/src/core/model/int64x64-cairo.h ns-3.23/src/core/model/int64x64-cairo.h
--- ns-3.22/src/core/model/int64x64-cairo.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/int64x64-cairo.h	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,11 @@
 
 #include "cairo-wideint-private.h"
 
+/**
+ * \file
+ * \ingroup highprec
+ * Declaration of the ns3::int64x64_t type using the Cairo implementation.
+ */
 
 namespace ns3 {
 
diff -Naur ns-3.22/src/core/model/int64x64.cc ns-3.23/src/core/model/int64x64.cc
--- ns-3.22/src/core/model/int64x64.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/int64x64.cc	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,12 @@
 #include "assert.h"
 #include "log.h"
 
+/**
+ * \file
+ * \ingroup highprec
+ * Implementation of the streaming input and output operators for
+ * the ns3::int64x64_t type.
+ */
 
 namespace ns3 {
 
diff -Naur ns-3.22/src/core/model/int64x64-double.h ns-3.23/src/core/model/int64x64-double.h
--- ns-3.22/src/core/model/int64x64-double.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/int64x64-double.h	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,12 @@
 #include <cmath>  // pow
 #include <utility>  // pair
 
+/**
+ * \file
+ * \ingroup highprec
+ * Declaration and implementation of the ns3::int64x64_t type
+ * using the double type.
+ */
 
 namespace ns3 {
 
diff -Naur ns-3.22/src/core/model/int64x64.h ns-3.23/src/core/model/int64x64.h
--- ns-3.22/src/core/model/int64x64.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/int64x64.h	2015-05-13 11:05:27.000000000 -0700
@@ -36,6 +36,12 @@
 
 #include <iostream>
 
+/**
+ * \file
+ * \ingroup highprec
+ * Declaration of the ns3::int64x64_t type and associated operators.
+ */
+
 namespace ns3 {
 
 /**
diff -Naur ns-3.22/src/core/model/list-scheduler.cc ns-3.23/src/core/model/list-scheduler.cc
--- ns-3.22/src/core/model/list-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/list-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,12 @@
 #include <string>
 #include "assert.h"
 
+/**
+ * \file
+ * \ingroup scheduler
+ * Implementation of ns3::ListScheduler class.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("ListScheduler");
@@ -36,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::ListScheduler")
     .SetParent<Scheduler> ()
+    .SetGroupName ("Core")
     .AddConstructor<ListScheduler> ()
   ;
   return tid;
diff -Naur ns-3.22/src/core/model/list-scheduler.h ns-3.23/src/core/model/list-scheduler.h
--- ns-3.22/src/core/model/list-scheduler.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/list-scheduler.h	2015-05-13 11:05:27.000000000 -0700
@@ -26,6 +26,12 @@
 #include <utility>
 #include <stdint.h>
 
+/**
+ * \file
+ * \ingroup scheduler
+ * Declaration of ns3::ListScheduler class.
+ */
+
 namespace ns3 {
 
 class EventImpl;
diff -Naur ns-3.22/src/core/model/log-macros-disabled.h ns-3.23/src/core/model/log-macros-disabled.h
--- ns-3.22/src/core/model/log-macros-disabled.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/log-macros-disabled.h	2015-05-13 11:05:27.000000000 -0700
@@ -18,11 +18,22 @@
  * Author: Andrey Mazo <ahippo@yandex.com>
  */
 
+/**
+ * \file
+ * \ingroup logging
+ * Definition of empty logging macros and the NS_LOG_NOOP_INTERNAL macro.
+ */
+
+
 #ifndef NS3_LOG_MACROS_DISABLED_H
 #define NS3_LOG_MACROS_DISABLED_H
 
 #ifndef NS3_LOG_ENABLE
 
+/**
+ * \ingroup logging
+ * Empty logging macro implementation, used when logging is disabled.
+ */
 #define NS_LOG_NOOP_INTERNAL(msg)           \
   do                                        \
     {                                       \
diff -Naur ns-3.22/src/core/model/log-macros-enabled.h ns-3.23/src/core/model/log-macros-enabled.h
--- ns-3.22/src/core/model/log-macros-enabled.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/log-macros-enabled.h	2015-05-13 11:05:27.000000000 -0700
@@ -21,6 +21,12 @@
 #ifndef NS3_LOG_MACROS_ENABLED_H
 #define NS3_LOG_MACROS_ENABLED_H
 
+/**
+ * \file
+ * \ingroup logging
+ * Definition of logging macros.
+ */
+
 #ifdef NS3_LOG_ENABLE
 
 
diff -Naur ns-3.22/src/core/model/map-scheduler.cc ns-3.23/src/core/model/map-scheduler.cc
--- ns-3.22/src/core/model/map-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/map-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,12 @@
 #include "log.h"
 #include <string>
 
+/**
+ * \file
+ * \ingroup scheduler
+ * Implementation of ns3::MapScheduler class.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("MapScheduler");
@@ -36,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::MapScheduler")
     .SetParent<Scheduler> ()
+    .SetGroupName ("Core")
     .AddConstructor<MapScheduler> ()
   ;
   return tid;
diff -Naur ns-3.22/src/core/model/map-scheduler.h ns-3.23/src/core/model/map-scheduler.h
--- ns-3.22/src/core/model/map-scheduler.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/map-scheduler.h	2015-05-13 11:05:27.000000000 -0700
@@ -26,6 +26,12 @@
 #include <map>
 #include <utility>
 
+/**
+ * \file
+ * \ingroup scheduler
+ * Declaration of ns3::MapScheduler class.
+ */
+
 namespace ns3 {
 
 /**
diff -Naur ns-3.22/src/core/model/math.h ns-3.23/src/core/model/math.h
--- ns-3.22/src/core/model/math.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/math.h	2015-05-13 11:05:27.000000000 -0700
@@ -24,6 +24,12 @@
 #ifndef MATH_H
 #define MATH_H
 
+/**
+ * \file
+ * \ingroup core
+ * Custom version of log2() to deal with \bugid{1467}.
+ */
+
 #include <cmath>
 
 #ifdef __FreeBSD__
diff -Naur ns-3.22/src/core/model/names.cc ns-3.23/src/core/model/names.cc
--- ns-3.22/src/core/model/names.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/names.cc	2015-05-13 11:05:27.000000000 -0700
@@ -23,6 +23,13 @@
 #include "abort.h"
 #include "names.h"
 
+/**
+ * \file
+ * \ingroup config
+ * Implementation of class ns3::Names, and declaration of classes
+ * ns3::NamesNode and ns3::NamePriv.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("Names");
diff -Naur ns-3.22/src/core/model/names.h ns-3.23/src/core/model/names.h
--- ns-3.22/src/core/model/names.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/names.h	2015-05-13 11:05:27.000000000 -0700
@@ -22,6 +22,12 @@
 #include "ptr.h"
 #include "object.h"
 
+/**
+ * \file
+ * \ingroup config
+ * Declaration of class ns3::Names.
+ */
+
 namespace ns3 {
 
 /**
diff -Naur ns-3.22/src/core/model/nstime.h ns-3.23/src/core/model/nstime.h
--- ns-3.22/src/core/model/nstime.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/nstime.h	2015-05-13 11:05:27.000000000 -0700
@@ -31,6 +31,13 @@
 #include <ostream>
 #include <set>
 
+/**
+ * \file
+ * \ingroup time
+ * Declaration of classes ns3::Time and ns3::TimeWithUnit,
+ * and the TimeValue implementation classes.
+ */
+
 namespace ns3 {
 
 class TimeWithUnit;
diff -Naur ns-3.22/src/core/model/object.cc ns-3.23/src/core/model/object.cc
--- ns-3.22/src/core/model/object.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/object.cc	2015-05-13 11:05:27.000000000 -0700
@@ -87,6 +87,7 @@
 {
   static TypeId tid = TypeId ("ns3::Object")
     .SetParent<ObjectBase> ()
+    .SetGroupName ("Core")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/core/model/object-factory.cc ns-3.23/src/core/model/object-factory.cc
--- ns-3.22/src/core/model/object-factory.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/object-factory.cc	2015-05-13 11:05:27.000000000 -0700
@@ -21,6 +21,12 @@
 #include "log.h"
 #include <sstream>
 
+/**
+ * \file
+ * \ingroup object
+ * ns3::ObjectFactory class implementation.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE("ObjectFactory");
diff -Naur ns-3.22/src/core/model/random-variable-stream.cc ns-3.23/src/core/model/random-variable-stream.cc
--- ns-3.22/src/core/model/random-variable-stream.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/random-variable-stream.cc	2015-05-13 11:05:27.000000000 -0700
@@ -36,6 +36,12 @@
 #include <cmath>
 #include <iostream>
 
+/**
+ * \file
+ * \ingroup randomvariable
+ * Implementation of ns3::RandomVariableStream and derivatives.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("RandomVariableStream");
@@ -47,6 +53,7 @@
 {
   static TypeId tid = TypeId ("ns3::RandomVariableStream")
     .SetParent<Object> ()
+    .SetGroupName ("Core")
     .AddAttribute("Stream",
 		  "The stream number for this RNG stream. -1 means \"allocate a stream automatically\". "
 		  "Note that if -1 is set, Get will return -1 so that it is not possible to know which "
@@ -137,6 +144,7 @@
 {
   static TypeId tid = TypeId ("ns3::UniformRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<UniformRandomVariable> ()
     .AddAttribute("Min", "The lower bound on the values returned by this RNG stream.",
 		  DoubleValue(0),
@@ -207,6 +215,7 @@
 {
   static TypeId tid = TypeId ("ns3::ConstantRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<ConstantRandomVariable> ()
     .AddAttribute("Constant", "The constant value returned by this RNG stream.",
 		  DoubleValue(0),
@@ -261,6 +270,7 @@
 {
   static TypeId tid = TypeId ("ns3::SequentialRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<SequentialRandomVariable> ()
     .AddAttribute("Min", "The first value of the sequence.",
 		  DoubleValue(0),
@@ -360,6 +370,7 @@
 {
   static TypeId tid = TypeId ("ns3::ExponentialRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<ExponentialRandomVariable> ()
     .AddAttribute("Mean", "The mean of the values returned by this RNG stream.",
 		  DoubleValue(1.0),
@@ -441,6 +452,7 @@
 {
   static TypeId tid = TypeId ("ns3::ParetoRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<ParetoRandomVariable> ()
     .AddAttribute("Mean", "The mean parameter for the Pareto distribution returned by this RNG stream.",
 		  DoubleValue(1.0),
@@ -536,6 +548,7 @@
 {
   static TypeId tid = TypeId ("ns3::WeibullRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<WeibullRandomVariable> ()
     .AddAttribute("Scale", "The scale parameter for the Weibull distribution returned by this RNG stream.",
 		  DoubleValue(1.0),
@@ -631,6 +644,7 @@
 {
   static TypeId tid = TypeId ("ns3::NormalRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<NormalRandomVariable> ()
     .AddAttribute("Mean", "The mean value for the normal distribution returned by this RNG stream.",
 		  DoubleValue(0.0),
@@ -748,6 +762,7 @@
 {
   static TypeId tid = TypeId ("ns3::LogNormalRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<LogNormalRandomVariable> ()
     .AddAttribute("Mu", "The mu value for the log-normal distribution returned by this RNG stream.",
 		  DoubleValue(0.0),
@@ -867,6 +882,7 @@
 {
   static TypeId tid = TypeId ("ns3::GammaRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<GammaRandomVariable> ()
     .AddAttribute("Alpha", "The alpha value for the gamma distribution returned by this RNG stream.",
 		  DoubleValue(1.0),
@@ -1042,6 +1058,7 @@
 {
   static TypeId tid = TypeId ("ns3::ErlangRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<ErlangRandomVariable> ()
     .AddAttribute("K", "The k value for the Erlang distribution returned by this RNG stream.",
 		  IntegerValue(1),
@@ -1153,6 +1170,7 @@
 {
   static TypeId tid = TypeId ("ns3::TriangularRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<TriangularRandomVariable> ()
     .AddAttribute("Mean", "The mean value for the triangular distribution returned by this RNG stream.",
 		  DoubleValue(0.5),
@@ -1247,6 +1265,7 @@
 {
   static TypeId tid = TypeId ("ns3::ZipfRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<ZipfRandomVariable> ()
     .AddAttribute("N", "The n value for the Zipf distribution returned by this RNG stream.",
 		  IntegerValue(1),
@@ -1337,6 +1356,7 @@
 {
   static TypeId tid = TypeId ("ns3::ZetaRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<ZetaRandomVariable> ()
     .AddAttribute("Alpha", "The alpha value for the zeta distribution returned by this RNG stream.",
 		  DoubleValue(3.14),
@@ -1420,6 +1440,7 @@
 {
   static TypeId tid = TypeId ("ns3::DeterministicRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<DeterministicRandomVariable> ()
     ;
   return tid;
@@ -1512,6 +1533,7 @@
 {
   static TypeId tid = TypeId ("ns3::EmpiricalRandomVariable")
     .SetParent<RandomVariableStream>()
+    .SetGroupName ("Core")
     .AddConstructor<EmpiricalRandomVariable> ()
     ;
   return tid;
@@ -1594,7 +1616,7 @@
 void EmpiricalRandomVariable::Validate ()
 {
   NS_LOG_FUNCTION (this);
-  ValueCDF prior;
+  ValueCDF prior = emp[0];
   for (std::vector<ValueCDF>::size_type i = 0; i < emp.size (); ++i)
     {
       ValueCDF& current = emp[i];
diff -Naur ns-3.22/src/core/model/realtime-simulator-impl.cc ns-3.23/src/core/model/realtime-simulator-impl.cc
--- ns-3.22/src/core/model/realtime-simulator-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/realtime-simulator-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -56,6 +56,7 @@
 {
   static TypeId tid = TypeId ("ns3::RealtimeSimulatorImpl")
     .SetParent<SimulatorImpl> ()
+    .SetGroupName ("Core")
     .AddConstructor<RealtimeSimulatorImpl> ()
     .AddAttribute ("SynchronizationMode", 
                    "What to do if the simulation cannot keep up with real time.",
diff -Naur ns-3.22/src/core/model/realtime-simulator-impl.h ns-3.23/src/core/model/realtime-simulator-impl.h
--- ns-3.22/src/core/model/realtime-simulator-impl.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/realtime-simulator-impl.h	2015-05-13 11:05:27.000000000 -0700
@@ -33,28 +33,62 @@
 
 #include <list>
 
+/**
+ * \file
+ * \ingroup realtime
+ * ns3::RealTimeSimulatorImpl declaration.
+ */
+
 namespace ns3 {
 
 /**
  * \ingroup simulator
+ * \defgroup realtime Realtime Simulator
+ *
+ * Realtime simulator implementation.
+ */
+  
+/**
+ * \ingroup realtime
+ *
+ * Realtime version of SimulatorImpl.
  */
 class RealtimeSimulatorImpl : public SimulatorImpl
 {
 public:
+  /**
+   * Get the registered TypeId for this class.
+   * \returns The TypeId.
+   */
   static TypeId GetTypeId (void);
 
   /**
-   * Enumeration of the types of packets supported in the class.
-   *
+   * What to do when we can't maintain real time synchrony.
    */
   enum SynchronizationMode {
-    SYNC_BEST_EFFORT, /** Make a best effort to keep synced to real-time */
-    SYNC_HARD_LIMIT, /** Keep to real-time within a tolerance or die trying */
+    /**
+     * Make a best effort to keep synced to real-time.
+     *
+     * If we fall behind, keep going.
+     */
+    SYNC_BEST_EFFORT, 
+    /**
+     * Keep to real time within the hard limit tolerance configured
+     * with SetHardLimit, or die trying.
+     *
+     * Falling behind by more than the hard limit tolerance triggers
+     * a fatal error.
+     * \see SetHardLimit
+     */
+    SYNC_HARD_LIMIT,  
   };
 
+  /** Constructor. */
   RealtimeSimulatorImpl ();
+  /** Destructor. */
   ~RealtimeSimulatorImpl ();
 
+  // Inherited from SimulatorImpl
   virtual void Destroy ();
   virtual bool IsFinished (void) const;
   virtual void Stop (void);
@@ -63,9 +97,9 @@
   virtual void ScheduleWithContext (uint32_t context, Time const &time, EventImpl *event);
   virtual EventId ScheduleNow (EventImpl *event);
   virtual EventId ScheduleDestroy (EventImpl *event);
-  virtual void Remove (const EventId &id);
-  virtual void Cancel (const EventId &id);
-  virtual bool IsExpired (const EventId &id) const;
+  virtual void Remove (const EventId &ev);
+  virtual void Cancel (const EventId &ev);
+  virtual bool IsExpired (const EventId &ev) const;
   virtual void Run (void);
   virtual Time Now (void) const;
   virtual Time GetDelayLeft (const EventId &id) const;
@@ -74,52 +108,115 @@
   virtual uint32_t GetSystemId (void) const; 
   virtual uint32_t GetContext (void) const;
 
+  /** \copydoc ScheduleWithContext */
   void ScheduleRealtimeWithContext (uint32_t context, Time const &time, EventImpl *event);
+  /** \copydoc Schedule */
   void ScheduleRealtime (Time const &time, EventImpl *event);
+  /**
+   * \copybrief ScheduleNow
+   *
+   * \param context Event context.
+   * \param event The event to schedule.
+   */
   void ScheduleRealtimeNowWithContext (uint32_t context, EventImpl *event);
+  /** \copydoc ScheduleNow */
   void ScheduleRealtimeNow (EventImpl *event);
+  /**
+   * Get the current real time from the synchronizer.
+   * \returns The current real time.
+   */
   Time RealtimeNow (void) const;
 
+  /**
+   * Set the SynchronizationMode.
+   *
+   * \param mode The new SynchronizationMode.
+   */
   void SetSynchronizationMode (RealtimeSimulatorImpl::SynchronizationMode mode);
+  /**
+   * Get the SynchronizationMode.
+   * \returns The current SynchronizationMode.
+   */
   RealtimeSimulatorImpl::SynchronizationMode GetSynchronizationMode (void) const;
 
+  /**
+   * Set the fatal error threshold for SynchronizationMode SYNC_HARD_LIMIT.
+   *
+   * \param limit The maximum amount of real time we are allowed to fall
+   *     behind before we trigger a fatal error.
+   */
   void SetHardLimit (Time limit);
+  /**
+   * Get the current fatal error threshold for SynchronizationMode
+   * SYNC_HARD_LIMIT.
+   *
+   * \returns The hard limit threshold.
+   */
   Time GetHardLimit (void) const;
 
 private:
+  /**
+   * Is the simulator running?
+   * \returns \c true if we are running.
+   */
   bool Running (void) const;
+  /**
+   * Check that the Synchronizer is locked to the real time clock.
+   * \return \c true if the Synchronizer is locked.
+   */
   bool Realtime (void) const;
+  /**
+   * Get the timestep of the next event.
+   * \returns The timestep of the next event.
+   */
   uint64_t NextTs (void) const;
+  /** Process the next event. */
   void ProcessOneEvent (void);
+  /** Destructor implementation. */
   virtual void DoDispose (void);
 
+  /** Container type for events to be run at destroy time. */
   typedef std::list<EventId> DestroyEvents;
+  /** Container for events to be run at destroy time. */
   DestroyEvents m_destroyEvents;
+  /** Has the stopping condition been reached? */
   bool m_stop;
+  /** Is the simulator currently running. */
   bool m_running;
 
-  // The following variables are protected using the m_mutex
+  /**
+   * \name Mutex-protected variables.
+   *
+   * These variables are protected by #m_mutex.
+   */
+  /**@{*/
+  /** The event list. */
   Ptr<Scheduler> m_events;
+  /**< Number of events in the event list. */
   int m_unscheduledEvents;
+  /**< Unique id for the next event to be scheduled. */
   uint32_t m_uid;
+  /**< Unique id of the current event. */
   uint32_t m_currentUid;
+  /**< Timestep of the current event. */
   uint64_t m_currentTs;
-  uint32_t m_currentContext;
+  /**< Execution context. */
+  uint32_t m_currentContext;  
+  /**@}*/
 
-  mutable SystemMutex m_mutex;
+  /** Mutex to control access to key state. */  
+  mutable SystemMutex m_mutex;  
 
+  /** The synchronizer in use to track real time. */
   Ptr<Synchronizer> m_synchronizer;
 
-  /**
-   * The policy to use if the simulation cannot keep synchronized to real-time.
-   */
+  /** SynchronizationMode policy. */
   SynchronizationMode m_synchronizationMode;
 
-  /**
-   * The maximum allowable drift from real-time in SYNC_HARD_LIMIT mode.
-   */
+  /** The maximum allowable drift from real-time in SYNC_HARD_LIMIT mode. */
   Time m_hardLimit;
 
+  /** Main SystemThread. */
   SystemThread::ThreadId m_main;
 };
 
diff -Naur ns-3.22/src/core/model/ref-count-base.cc ns-3.23/src/core/model/ref-count-base.cc
--- ns-3.22/src/core/model/ref-count-base.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/ref-count-base.cc	2015-05-13 11:05:27.000000000 -0700
@@ -24,6 +24,12 @@
 #include "ref-count-base.h"
 #include "log.h"
 
+/**
+ * \file
+ * \ingroup ptr
+ * (Deprecated) ns3::RefCountBase implementation.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("RefCountBase");
diff -Naur ns-3.22/src/core/model/ref-count-base.h ns-3.23/src/core/model/ref-count-base.h
--- ns-3.22/src/core/model/ref-count-base.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/ref-count-base.h	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,12 @@
 
 #include "simple-ref-count.h"
 
+/**
+ * \file
+ * \ingroup ptr
+ * (Deprecated) ns3::RefCountBase declaration.
+ */
+
 namespace ns3 {
 
 /**
diff -Naur ns-3.22/src/core/model/rng-seed-manager.cc ns-3.23/src/core/model/rng-seed-manager.cc
--- ns-3.22/src/core/model/rng-seed-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/rng-seed-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -24,6 +24,12 @@
 #include "config.h"
 #include "log.h"
 
+/**
+ * \file
+ * \ingroup randomvariable
+ * ns3::RngSeedManager implementation.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("RngSeedManager");
diff -Naur ns-3.22/src/core/model/scheduler.cc ns-3.23/src/core/model/scheduler.cc
--- ns-3.22/src/core/model/scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -44,6 +44,7 @@
 {
   static TypeId tid = TypeId ("ns3::Scheduler")
     .SetParent<Object> ()
+    .SetGroupName ("Core")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/core/model/simulator-impl.cc ns-3.23/src/core/model/simulator-impl.cc
--- ns-3.22/src/core/model/simulator-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/simulator-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -20,6 +20,12 @@
 #include "simulator-impl.h"
 #include "log.h"
 
+/**
+ * \file
+ * \ingroup simulator
+ * Implementation of class ns3::SimulatorImpl.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("SimulatorImpl");
@@ -31,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::SimulatorImpl")
     .SetParent<Object> ()
+    .SetGroupName ("Core")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/core/model/simulator-impl.h ns-3.23/src/core/model/simulator-impl.h
--- ns-3.22/src/core/model/simulator-impl.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/core/model/simulator-impl.h	2015-05-13 11:05:27.000000000 -0700
@@ -28,6 +28,12 @@
 #include "object-factory.h"
 #include "ptr.h"
 
+/**
+ * \file
+ * \ingroup simulator
+ * Declaration of class ns3::SimulatorImpl.
+ */
+
 namespace ns3 {
 
 class Scheduler;
diff -Naur ns-3.22/src/core/model/synchronizer.cc ns-3.23/src/core/model/synchronizer.cc
--- ns-3.22/src/core/model/synchronizer.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/model/synchronizer.cc	2015-05-13 11:05:27.000000000 -0700
@@ -36,6 +36,7 @@
 {
   static TypeId tid = TypeId ("ns3::Synchronizer")
     .SetParent<Object> ()
+    .SetGroupName ("Core")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/core/model/test.cc ns-3.23/src/core/model/test.cc
--- ns-3.22/src/core/model/test.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/model/test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -28,6 +28,12 @@
 #include <map>
 
 
+/**
+ * \file
+ * \ingroup testing
+ * Implementation of the testing classes and functions
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("Test");
diff -Naur ns-3.22/src/core/model/test.h ns-3.23/src/core/model/test.h
--- ns-3.22/src/core/model/test.h	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/model/test.h	2015-05-13 11:05:27.000000000 -0700
@@ -31,6 +31,12 @@
 #include "system-wall-clock-ms.h"
 
 /**
+ * \file
+ * \ingroup testing
+ * Definition of the testing macros and declaration of the testing classes.
+ */
+
+/**
  * \ingroup core
  * \defgroup testing Testing
  * \brief Tools to define and execute unit tests.
diff -Naur ns-3.22/src/core/model/time.cc ns-3.23/src/core/model/time.cc
--- ns-3.22/src/core/model/time.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/model/time.cc	2015-05-13 11:05:27.000000000 -0700
@@ -27,6 +27,13 @@
 #include <iomanip>  // showpos
 #include <sstream>
 
+/**
+ * \file
+ * \ingroup time
+ * Implementation of classes ns3::Time and ns3::TimeWithUnit,
+ * and the TimeValue implementation classes.
+ */
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE_MASK ("Time", ns3::LOG_PREFIX_TIME);
diff -Naur ns-3.22/src/core/model/type-id.cc ns-3.23/src/core/model/type-id.cc
--- ns-3.22/src/core/model/type-id.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/model/type-id.cc	2015-05-13 11:05:27.000000000 -0700
@@ -28,6 +28,13 @@
 #include <sstream>
 #include <iomanip>
 
+/**
+ * \file
+ * \ingroup object
+ * ns3::TypeId and ns3::IidManager implementations.
+ */
+
+
 /*********************************************************************
  *         Helper code
  *********************************************************************/
diff -Naur ns-3.22/src/core/model/type-id.h ns-3.23/src/core/model/type-id.h
--- ns-3.22/src/core/model/type-id.h	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/model/type-id.h	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,12 @@
 #include <string>
 #include <stdint.h>
 
+/**
+ * \file
+ * \ingroup object
+ * ns3::TypeId declaration; inline and template implementations.
+ */
+
 namespace ns3 {
 
 class ObjectBase;
diff -Naur ns-3.22/src/core/model/type-traits.h ns-3.23/src/core/model/type-traits.h
--- ns-3.22/src/core/model/type-traits.h	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/model/type-traits.h	2015-05-13 11:05:27.000000000 -0700
@@ -20,6 +20,12 @@
 #ifndef TYPE_TRAITS_H
 #define TYPE_TRAITS_H
 
+/**
+ * \file
+ * \ingroup object
+ * TypeTraits introspection template.
+ */
+
 /** Type trait reference values */
 template <typename T>
 struct TypeTraits
diff -Naur ns-3.22/src/core/model/unused.h ns-3.23/src/core/model/unused.h
--- ns-3.22/src/core/model/unused.h	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/model/unused.h	2015-05-13 11:05:27.000000000 -0700
@@ -1,10 +1,26 @@
 #ifndef UNUSED_H
 #define UNUSED_H
 
+/**
+ * \file
+ * \ingroup core
+ * Definition of the NS_UNUSED NS_UNUSED_GLOBAL macros.
+ */
+
+/**
+ * \ingroup core
+ * \def NS_UNUSED()
+ * Mark a local variable as unused.
+ */
 #ifndef NS_UNUSED
 # define NS_UNUSED(x) ((void)(x))
 #endif
 
+/**
+ * \ingroup core
+ * \def NS_UNUSED_GLOBAL()
+ * Mark a variable at file scope as unused.
+ */
 #ifndef NS_UNUSED_GLOBAL
 #if defined(__GNUC__)
 # define NS_UNUSED_GLOBAL(x) x __attribute__((unused))
diff -Naur ns-3.22/src/core/model/wall-clock-synchronizer.cc ns-3.23/src/core/model/wall-clock-synchronizer.cc
--- ns-3.22/src/core/model/wall-clock-synchronizer.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/model/wall-clock-synchronizer.cc	2015-05-13 11:05:27.000000000 -0700
@@ -43,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::WallClockSynchronizer")
     .SetParent<Synchronizer> ()
+    .SetGroupName ("Core")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/core/test/random-variable-stream-test-suite.cc ns-3.23/src/core/test/random-variable-stream-test-suite.cc
--- ns-3.22/src/core/test/random-variable-stream-test-suite.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/core/test/random-variable-stream-test-suite.cc	2015-05-13 11:05:27.000000000 -0700
@@ -2754,6 +2754,13 @@
   // Test that values have approximately the right mean value.
   double TOLERANCE = expectedMean * 1e-2;
   NS_TEST_ASSERT_MSG_EQ_TOL (valueMean, expectedMean, TOLERANCE, "Wrong mean value."); 
+
+  // Bug 2082: Create the RNG with a uniform distribution between -1 and 1.
+  Ptr<EmpiricalRandomVariable> y = CreateObject<EmpiricalRandomVariable> ();
+  y->CDF (-1.0,  0.0);
+  y->CDF (0.0,  0.5);
+  y->CDF (1.0,  1.0);
+  NS_TEST_ASSERT_MSG_LT (y->GetValue (), 2, "Empirical variable with negative domain");
 }
 
 // ===========================================================================
diff -Naur ns-3.22/src/csma/bindings/modulegen__gcc_ILP32.py ns-3.23/src/csma/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/csma/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/csma/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -1157,11 +1157,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/csma/bindings/modulegen__gcc_LP64.py ns-3.23/src/csma/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/csma/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/csma/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -1157,11 +1157,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/csma/model/backoff.cc ns-3.23/src/csma/model/backoff.cc
--- ns-3.22/src/csma/model/backoff.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/csma/model/backoff.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,6 +32,7 @@
   m_maxSlots = 1000;
   m_ceiling = 10;
   m_maxRetries = 1000;
+  m_numBackoffRetries = 0;
   m_rng = CreateObject<UniformRandomVariable> ();
 
   ResetBackoffTime ();
@@ -44,6 +45,7 @@
   m_maxSlots = maxSlots;
   m_ceiling = ceiling;
   m_maxRetries = maxRetries;
+  m_numBackoffRetries = 0;
   m_rng = CreateObject<UniformRandomVariable> ();
 }
 
diff -Naur ns-3.22/src/csma/model/csma-channel.cc ns-3.23/src/csma/model/csma-channel.cc
--- ns-3.22/src/csma/model/csma-channel.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/csma/model/csma-channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::CsmaChannel")
     .SetParent<Channel> ()
+    .SetGroupName ("Csma")
     .AddConstructor<CsmaChannel> ()
     .AddAttribute ("DataRate", 
                    "The transmission data rate to be provided to devices connected to the channel",
diff -Naur ns-3.22/src/csma/model/csma-net-device.cc ns-3.23/src/csma/model/csma-net-device.cc
--- ns-3.22/src/csma/model/csma-net-device.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/csma/model/csma-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -44,6 +44,7 @@
 {
   static TypeId tid = TypeId ("ns3::CsmaNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Csma")
     .AddConstructor<CsmaNetDevice> ()
     .AddAttribute ("Address", 
                    "The MAC address of this device.",
@@ -520,7 +521,7 @@
           m_txMachineState = BUSY;
           m_phyTxBeginTrace (m_currentPkt);
 
-          Time tEvent = Seconds (m_bps.CalculateTxTime (m_currentPkt->GetSize ()));
+          Time tEvent = m_bps.CalculateBytesTxTime (m_currentPkt->GetSize ());
           NS_LOG_LOGIC ("Schedule TransmitCompleteEvent in " << tEvent.GetSeconds () << "sec");
           Simulator::Schedule (tEvent, &CsmaNetDevice::TransmitCompleteEvent, this);
         }
@@ -656,7 +657,7 @@
   //
   // We use the Ethernet interframe gap of 96 bit times.
   //
-  m_tInterframeGap = Seconds (m_bps.CalculateTxTime (96/8));
+  m_tInterframeGap = m_bps.CalculateBytesTxTime (96/8);
 
   //
   // This device is up whenever a channel is attached to it.
diff -Naur ns-3.22/src/csma-layout/bindings/modulegen__gcc_ILP32.py ns-3.23/src/csma-layout/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/csma-layout/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/csma-layout/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -1340,11 +1340,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/csma-layout/bindings/modulegen__gcc_LP64.py ns-3.23/src/csma-layout/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/csma-layout/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/csma-layout/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -1340,11 +1340,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/dsdv/model/dsdv-packet.cc ns-3.23/src/dsdv/model/dsdv-packet.cc
--- ns-3.22/src/dsdv/model/dsdv-packet.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsdv/model/dsdv-packet.cc	2015-05-13 11:05:26.000000000 -0700
@@ -53,6 +53,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsdv::DsdvHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Dsdv")
     .AddConstructor<DsdvHeader> ();
   return tid;
 }
diff -Naur ns-3.22/src/dsdv/model/dsdv-routing-protocol.cc ns-3.23/src/dsdv/model/dsdv-routing-protocol.cc
--- ns-3.22/src/dsdv/model/dsdv-routing-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsdv/model/dsdv-routing-protocol.cc	2015-05-13 11:05:26.000000000 -0700
@@ -66,7 +66,7 @@
   static TypeId
   GetTypeId ()
   {
-    static TypeId tid = TypeId ("ns3::dsdv::DeferredRouteOutputTag").SetParent<Tag> ();
+    static TypeId tid = TypeId ("ns3::dsdv::DeferredRouteOutputTag").SetParent<Tag> ().SetGroupName ("Dsdv");
     return tid;
   }
 
@@ -106,6 +106,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsdv::RoutingProtocol")
     .SetParent<Ipv4RoutingProtocol> ()
+    .SetGroupName ("Dsdv")
     .AddConstructor<RoutingProtocol> ()
     .AddAttribute ("PeriodicUpdateInterval","Periodic interval between exchange of full routing tables among nodes. ",
                    TimeValue (Seconds (15)),
diff -Naur ns-3.22/src/dsr/bindings/modulegen__gcc_ILP32.py ns-3.23/src/dsr/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/dsr/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:26.000000000 -0700
@@ -6042,6 +6042,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -6515,10 +6519,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -6692,10 +6696,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiMode,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiTxVector,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
diff -Naur ns-3.22/src/dsr/bindings/modulegen__gcc_LP64.py ns-3.23/src/dsr/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/dsr/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:26.000000000 -0700
@@ -6042,6 +6042,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -6515,10 +6519,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -6692,10 +6696,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiMode,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiTxVector,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
diff -Naur ns-3.22/src/dsr/model/dsr-fs-header.cc ns-3.23/src/dsr/model/dsr-fs-header.cc
--- ns-3.22/src/dsr/model/dsr-fs-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/model/dsr-fs-header.cc	2015-05-13 11:05:26.000000000 -0700
@@ -47,6 +47,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrFsHeader")
     .AddConstructor<DsrFsHeader> ()
     .SetParent<Header> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/dsr/model/dsr-gratuitous-reply-table.cc ns-3.23/src/dsr/model/dsr-gratuitous-reply-table.cc
--- ns-3.22/src/dsr/model/dsr-gratuitous-reply-table.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/model/dsr-gratuitous-reply-table.cc	2015-05-13 11:05:26.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::GraReply")
     .SetParent<Object> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<GraReply> ()
   ;
   return tid;
diff -Naur ns-3.22/src/dsr/model/dsr-network-queue.cc ns-3.23/src/dsr/model/dsr-network-queue.cc
--- ns-3.22/src/dsr/model/dsr-network-queue.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/model/dsr-network-queue.cc	2015-05-13 11:05:26.000000000 -0700
@@ -51,6 +51,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrNetworkQueue")
     .SetParent<Object> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrNetworkQueue>  ()
   ;
   return tid;
diff -Naur ns-3.22/src/dsr/model/dsr-option-header.cc ns-3.23/src/dsr/model/dsr-option-header.cc
--- ns-3.22/src/dsr/model/dsr-option-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/model/dsr-option-header.cc	2015-05-13 11:05:26.000000000 -0700
@@ -51,6 +51,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionHeader")
     .AddConstructor<DsrOptionHeader> ()
     .SetParent<Header> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -139,6 +140,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionPad1Header")
     .AddConstructor<DsrOptionPad1Header> ()
     .SetParent<DsrOptionHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -190,6 +192,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionPadnHeader")
     .AddConstructor<DsrOptionPadnHeader> ()
     .SetParent<DsrOptionHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -250,6 +253,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionRreqHeader")
     .AddConstructor<DsrOptionRreqHeader> ()
     .SetParent<DsrOptionHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -397,6 +401,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionRrepHeader")
     .AddConstructor<DsrOptionRrepHeader> ()
     .SetParent<DsrOptionHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -518,6 +523,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionSRHeader")
     .AddConstructor<DsrOptionSRHeader> ()
     .SetParent<DsrOptionHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -660,6 +666,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionRerrHeader")
     .AddConstructor<DsrOptionRerrHeader> ()
     .SetParent<DsrOptionHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -782,6 +789,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionRerrUnreachHeader")
     .AddConstructor<DsrOptionRerrUnreachHeader> ()
     .SetParent<DsrOptionRerrHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -910,6 +918,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionRerrUnsupportHeader")
     .AddConstructor<DsrOptionRerrUnsupportHeader> ()
     .SetParent<DsrOptionRerrHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -1028,6 +1037,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionAckReqHeader")
     .AddConstructor<DsrOptionAckReqHeader> ()
     .SetParent<DsrOptionHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
@@ -1103,6 +1113,7 @@
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionAckHeader")
     .AddConstructor<DsrOptionAckHeader> ()
     .SetParent<DsrOptionHeader> ()
+    .SetGroupName ("Dsr")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/dsr/model/dsr-options.cc ns-3.23/src/dsr/model/dsr-options.cc
--- ns-3.22/src/dsr/model/dsr-options.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/model/dsr-options.cc	2015-05-13 11:05:26.000000000 -0700
@@ -72,6 +72,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrOptions")
     .SetParent<Object> ()
+    .SetGroupName ("Dsr")
     .AddAttribute ("OptionNumber", "The Dsr option number.",
                    UintegerValue (0),
                    MakeUintegerAccessor (&DsrOptions::GetOptionNumber),
@@ -384,6 +385,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionPad1")
     .SetParent<DsrOptions> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrOptionPad1> ()
   ;
   return tid;
@@ -424,6 +426,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionPadn")
     .SetParent<DsrOptions> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrOptionPadn> ()
   ;
   return tid;
@@ -464,6 +467,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionRreq")
     .SetParent<DsrOptions> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrOptionRreq> ()
   ;
   return tid;
@@ -963,6 +967,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionRrep")
     .SetParent<DsrOptions> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrOptionRrep> ()
   ;
   return tid;
@@ -1163,6 +1168,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionSR")
     .SetParent<DsrOptions> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrOptionSR> ()
   ;
   return tid;
@@ -1404,6 +1410,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionRerr")
     .SetParent<DsrOptions> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrOptionRerr> ()
   ;
   return tid;
@@ -1583,6 +1590,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionAckReq")
     .SetParent<DsrOptions> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrOptionAckReq> ()
   ;
   return tid;
@@ -1638,6 +1646,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrOptionAck")
     .SetParent<DsrOptions> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrOptionAck> ()
   ;
   return tid;
diff -Naur ns-3.22/src/dsr/model/dsr-passive-buff.cc ns-3.23/src/dsr/model/dsr-passive-buff.cc
--- ns-3.22/src/dsr/model/dsr-passive-buff.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/model/dsr-passive-buff.cc	2015-05-13 11:05:26.000000000 -0700
@@ -48,6 +48,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::PassiveBuffer")
     .SetParent<Object> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<PassiveBuffer> ()
   ;
   return tid;
diff -Naur ns-3.22/src/dsr/model/dsr-rcache.cc ns-3.23/src/dsr/model/dsr-rcache.cc
--- ns-3.22/src/dsr/model/dsr-rcache.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/model/dsr-rcache.cc	2015-05-13 11:05:26.000000000 -0700
@@ -138,6 +138,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::RouteCache")
     .SetParent<Object> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<RouteCache> ()
   ;
   return tid;
diff -Naur ns-3.22/src/dsr/model/dsr-routing.cc ns-3.23/src/dsr/model/dsr-routing.cc
--- ns-3.22/src/dsr/model/dsr-routing.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/model/dsr-routing.cc	2015-05-13 11:05:26.000000000 -0700
@@ -108,6 +108,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::DsrRouting")
     .SetParent<IpL4Protocol> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<DsrRouting> ()
     .AddAttribute ("RouteCache",
                    "The route cache for saving routes from "
diff -Naur ns-3.22/src/dsr/model/dsr-rreq-table.cc ns-3.23/src/dsr/model/dsr-rreq-table.cc
--- ns-3.22/src/dsr/model/dsr-rreq-table.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/dsr/model/dsr-rreq-table.cc	2015-05-13 11:05:26.000000000 -0700
@@ -46,6 +46,7 @@
 {
   static TypeId tid = TypeId ("ns3::dsr::RreqTable")
     .SetParent<Object> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<RreqTable> ()
   ;
   return tid;
diff -Naur ns-3.22/src/energy/bindings/modulegen__gcc_ILP32.py ns-3.23/src/energy/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/energy/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:26.000000000 -0700
@@ -3564,6 +3564,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -4037,10 +4041,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -4214,10 +4218,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiMode,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiTxVector,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
diff -Naur ns-3.22/src/energy/bindings/modulegen__gcc_LP64.py ns-3.23/src/energy/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/energy/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:26.000000000 -0700
@@ -3564,6 +3564,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -4037,10 +4041,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -4214,10 +4218,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiMode,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiTxVector,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
diff -Naur ns-3.22/src/energy/doc/energy.rst ns-3.23/src/energy/doc/energy.rst
--- ns-3.22/src/energy/doc/energy.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/doc/energy.rst	2015-05-13 11:05:26.000000000 -0700
@@ -186,6 +186,11 @@
    Energy Framework for Network Simulator 3 (ns-3). Workshop on ns-3
    (WNS3), Poster Session, Atlanta, GA, USA. May, 2014.
 
+.. [7] C. Tapparello, H. Ayatollahi and W. Heinzelman. Energy Harvesting 
+   Framework for Network Simulator 3 (ns-3). 2nd International Workshop on
+   Energy Neutral Sensing Systems (ENSsys), Memphis, TN, USA. November 6,
+   2014.
+
 Usage
 =====
 
diff -Naur ns-3.22/src/energy/helper/energy-harvester-container.cc ns-3.23/src/energy/helper/energy-harvester-container.cc
--- ns-3.22/src/energy/helper/energy-harvester-container.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/helper/energy-harvester-container.cc	2015-05-13 11:05:26.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::EnergyHarvesterContainer")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
     .AddConstructor<EnergyHarvesterContainer> ()
   ;
   return tid;
diff -Naur ns-3.22/src/energy/helper/energy-source-container.cc ns-3.23/src/energy/helper/energy-source-container.cc
--- ns-3.22/src/energy/helper/energy-source-container.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/helper/energy-source-container.cc	2015-05-13 11:05:26.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::EnergySourceContainer")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
     .AddConstructor<EnergySourceContainer> ()
   ;
   return tid;
diff -Naur ns-3.22/src/energy/helper/li-ion-energy-source-helper.cc ns-3.23/src/energy/helper/li-ion-energy-source-helper.cc
--- ns-3.22/src/energy/helper/li-ion-energy-source-helper.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/energy/helper/li-ion-energy-source-helper.cc	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,53 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 Wireless Communications and Networking Group (WCNG),
+ * University of Rochester, Rochester, NY, USA.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: Hoda Ayatollahi <hayatoll@ur.rochester.edu>
+ *          Cristiano Tapparello <cristiano.tapparello@rochester.edu>
+ */
+
+#include "li-ion-energy-source-helper.h"
+#include "ns3/energy-source.h"
+
+namespace ns3 {
+
+LiIonEnergySourceHelper::LiIonEnergySourceHelper ()
+{
+  m_liIonEnergySource.SetTypeId ("ns3::LiIonEnergySource");
+}
+
+LiIonEnergySourceHelper::~LiIonEnergySourceHelper ()
+{
+}
+
+void 
+LiIonEnergySourceHelper::Set (std::string name, const AttributeValue &v)
+{
+  m_liIonEnergySource.Set (name, v);
+}
+
+Ptr<EnergySource> 
+LiIonEnergySourceHelper::DoInstall (Ptr<Node> node) const
+{
+  NS_ASSERT (node != NULL);
+  Ptr<EnergySource> source = m_liIonEnergySource.Create<EnergySource> ();
+  NS_ASSERT (source != NULL);
+  source->SetNode (node);
+  return source;
+}
+
+} // namespace ns3
diff -Naur ns-3.22/src/energy/helper/li-ion-energy-source-helper.h ns-3.23/src/energy/helper/li-ion-energy-source-helper.h
--- ns-3.22/src/energy/helper/li-ion-energy-source-helper.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/energy/helper/li-ion-energy-source-helper.h	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,54 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 Wireless Communications and Networking Group (WCNG),
+ * University of Rochester, Rochester, NY, USA.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: Hoda Ayatollahi <hayatoll@ur.rochester.edu>
+ *          Cristiano Tapparello <cristiano.tapparello@rochester.edu>
+ */
+
+#ifndef LI_ION_ENERGY_SOURCE_HELPER_H_
+#define LI_ION_ENERGY_SOURCE_HELPER_H_
+
+#include "energy-model-helper.h"
+#include "ns3/node.h"
+
+namespace ns3 {
+
+/**
+ * \ingroup energy
+ * \brief Creates a LiIonEnergySource  object.
+ *
+ */
+class LiIonEnergySourceHelper: public EnergySourceHelper
+{
+public:
+  LiIonEnergySourceHelper ();
+  ~LiIonEnergySourceHelper ();
+
+  void Set (std::string name, const AttributeValue &v);
+
+private:
+  virtual Ptr<EnergySource> DoInstall (Ptr<Node> node) const;
+
+private:
+  ObjectFactory m_liIonEnergySource;
+
+};
+
+} // namespace ns3
+
+#endif /* LI_ION_ENERGY_SOURCE_HELPER_H_ */
diff -Naur ns-3.22/src/energy/model/basic-energy-harvester.cc ns-3.23/src/energy/model/basic-energy-harvester.cc
--- ns-3.22/src/energy/model/basic-energy-harvester.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/basic-energy-harvester.cc	2015-05-13 11:05:26.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::BasicEnergyHarvester")
   .SetParent<EnergyHarvester> ()
+  .SetGroupName ("Energy")
   .AddConstructor<BasicEnergyHarvester> ()
   .AddAttribute ("PeriodicHarvestedPowerUpdateInterval",
                  "Time between two consecutive periodic updates of the harvested power. By default, the value is updated every 1 s",
diff -Naur ns-3.22/src/energy/model/basic-energy-source.cc ns-3.23/src/energy/model/basic-energy-source.cc
--- ns-3.22/src/energy/model/basic-energy-source.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/basic-energy-source.cc	2015-05-13 11:05:26.000000000 -0700
@@ -36,6 +36,7 @@
 {
   static TypeId tid = TypeId ("ns3::BasicEnergySource")
     .SetParent<EnergySource> ()
+    .SetGroupName ("Energy")
     .AddConstructor<BasicEnergySource> ()
     .AddAttribute ("BasicEnergySourceInitialEnergyJ",
                    "Initial energy stored in basic energy source.",
diff -Naur ns-3.22/src/energy/model/device-energy-model.cc ns-3.23/src/energy/model/device-energy-model.cc
--- ns-3.22/src/energy/model/device-energy-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/device-energy-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::DeviceEnergyModel")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/energy/model/energy-harvester.cc ns-3.23/src/energy/model/energy-harvester.cc
--- ns-3.22/src/energy/model/energy-harvester.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/energy-harvester.cc	2015-05-13 11:05:26.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::EnergyHarvester")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/energy/model/energy-source.cc ns-3.23/src/energy/model/energy-source.cc
--- ns-3.22/src/energy/model/energy-source.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/energy-source.cc	2015-05-13 11:05:26.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::EnergySource")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/energy/model/li-ion-energy-source.cc ns-3.23/src/energy/model/li-ion-energy-source.cc
--- ns-3.22/src/energy/model/li-ion-energy-source.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/li-ion-energy-source.cc	2015-05-13 11:05:26.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::LiIonEnergySource")
     .SetParent<EnergySource> ()
+    .SetGroupName ("Energy")
     .AddConstructor<LiIonEnergySource> ()
     .AddAttribute ("LiIonEnergySourceInitialEnergyJ",
                    "Initial energy stored in basic energy source.",
diff -Naur ns-3.22/src/energy/model/rv-battery-model.cc ns-3.23/src/energy/model/rv-battery-model.cc
--- ns-3.22/src/energy/model/rv-battery-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/rv-battery-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::RvBatteryModel")
     .SetParent<EnergySource> ()
+    .SetGroupName ("Energy")
     .AddConstructor<RvBatteryModel> ()
     .AddAttribute ("RvBatteryModelPeriodicEnergyUpdateInterval",
                    "RV battery model sampling interval.",
@@ -94,8 +95,9 @@
 RvBatteryModel::RvBatteryModel ()
 {
   NS_LOG_FUNCTION (this);
-  m_lastSampleTime = Seconds (0.0);
-  m_previousLoad = 0.0;
+  m_lastSampleTime = Simulator::Now ();
+  m_timeStamps.push_back (m_lastSampleTime);
+  m_previousLoad = -1.0;
   m_batteryLevel = 1; // fully charged
   m_lifetime = Seconds (0.0);
 }
@@ -170,13 +172,12 @@
       m_batteryLevel = 0;
     }
 
-  // check if battery is dead.
+  // check if battery level is below the low battery threshold.
   if (m_batteryLevel <= m_lowBatteryTh)
     {
-      m_lifetime = Simulator::Now ();
-      NS_LOG_DEBUG ("RvBatteryModel:Battery is dead!");
+      m_lifetime = Simulator::Now () - m_timeStamps[0];
+      NS_LOG_DEBUG ("RvBatteryModel:Battery level below threshold!");
       HandleEnergyDrainedEvent ();
-      return; // stop periodic sampling
     }
 
   m_previousLoad = currentLoad;
@@ -326,19 +327,15 @@
     {
       m_load.push_back (load);
       m_previousLoad = load;
-      if (t != Seconds (0.0))
-        {
-          m_timeStamps[m_timeStamps.size () - 1] = m_lastSampleTime;
-        }
-      else
-        {
-          m_timeStamps.push_back (Seconds (0.0));
-        }
+      m_timeStamps[m_timeStamps.size () - 1] = m_lastSampleTime;
       m_timeStamps.push_back (t);
     }
   else
     {
-      m_timeStamps[m_timeStamps.size () - 1] = t;
+      if  (!m_timeStamps.empty())
+      {
+        m_timeStamps[m_timeStamps.size () - 1] = t;
+      }
     }
 
   m_lastSampleTime = t;
diff -Naur ns-3.22/src/energy/model/rv-battery-model.h ns-3.23/src/energy/model/rv-battery-model.h
--- ns-3.22/src/energy/model/rv-battery-model.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/rv-battery-model.h	2015-05-13 11:05:26.000000000 -0700
@@ -55,7 +55,7 @@
   virtual ~RvBatteryModel ();
 
   /**
-   * \return Initial energy stored (theoretical capacity) in the battery.
+   * \return Initial energy stored (theoretical capacity) in the battery, in Joules.
    *
    * Implements GetInitialEnergy.
    */
diff -Naur ns-3.22/src/energy/model/simple-device-energy-model.cc ns-3.23/src/energy/model/simple-device-energy-model.cc
--- ns-3.22/src/energy/model/simple-device-energy-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/simple-device-energy-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::SimpleDeviceEnergyModel")
     .SetParent<DeviceEnergyModel> ()
+    .SetGroupName ("Energy")
     .AddConstructor<SimpleDeviceEnergyModel> ()
     .AddTraceSource ("TotalEnergyConsumption",
                      "Total energy consumption of the radio device.",
diff -Naur ns-3.22/src/energy/model/wifi-radio-energy-model.cc ns-3.23/src/energy/model/wifi-radio-energy-model.cc
--- ns-3.22/src/energy/model/wifi-radio-energy-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/wifi-radio-energy-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiRadioEnergyModel")
     .SetParent<DeviceEnergyModel> ()
+    .SetGroupName ("Energy")
     .AddConstructor<WifiRadioEnergyModel> ()
     .AddAttribute ("IdleCurrentA",
                    "The default radio Idle current in Ampere.",
diff -Naur ns-3.22/src/energy/model/wifi-tx-current-model.cc ns-3.23/src/energy/model/wifi-tx-current-model.cc
--- ns-3.22/src/energy/model/wifi-tx-current-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/energy/model/wifi-tx-current-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiTxCurrentModel")
     .SetParent<Object> ()
+    .SetGroupName ("Energy")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/fd-net-device/bindings/modulegen__gcc_ILP32.py ns-3.23/src/fd-net-device/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:26.000000000 -0700
@@ -1053,11 +1053,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/fd-net-device/bindings/modulegen__gcc_LP64.py ns-3.23/src/fd-net-device/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/fd-net-device/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/fd-net-device/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:26.000000000 -0700
@@ -1053,11 +1053,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/fd-net-device/doc/fd-net-device.rst ns-3.23/src/fd-net-device/doc/fd-net-device.rst
--- ns-3.22/src/fd-net-device/doc/fd-net-device.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/fd-net-device/doc/fd-net-device.rst	2015-05-13 11:05:26.000000000 -0700
@@ -131,7 +131,7 @@
 DIX for Ethernet II frames, LLC for 802.2 LLC/SNAP frames, 
 and DIXPI for Ethernet II frames with an additional TAP PI header.
 This means that traffic traversing the file descriptor is expected to be 
-Ethernet II compatible. 
+Ethernet II compatible.  IEEE 802.1q (VLAN) tagging is not supported.
 Attaching an FdNetDevice to a wireless interface is possible as long as the 
 driver provides Ethernet II frames to the socket API. 
 Note that to associate a FdNetDevice to a wireless card in ad-hoc mode, 
diff -Naur ns-3.22/src/fd-net-device/examples/fd2fd-onoff.cc ns-3.23/src/fd-net-device/examples/fd2fd-onoff.cc
--- ns-3.22/src/fd-net-device/examples/fd2fd-onoff.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/fd-net-device/examples/fd2fd-onoff.cc	2015-05-13 11:05:26.000000000 -0700
@@ -38,6 +38,7 @@
 // Steps to run the experiment:
 //
 // $ ./waf --run="fd2fd-onoff"
+// $ ./waf --run="fd2fd-onoff --tcpMode=1"
 //
 
 #include <sys/socket.h>
@@ -56,6 +57,24 @@
 int
 main (int argc, char *argv[])
 {
+
+  // Command-line arguments
+  //
+  bool tcpMode = false;
+  CommandLine cmd;
+  cmd.AddValue ("tcpMode", "1:true, 0:false, default mode UDP",tcpMode);
+  cmd.Parse (argc, argv);
+   
+  std::string factory;
+  if (tcpMode==1)
+    {
+      factory = "ns3::TcpSocketFactory";
+    }
+  else
+    {
+      factory = "ns3::UdpSocketFactory";
+    }
+
   GlobalValue::Bind ("ChecksumEnabled", BooleanValue (true));
 
   uint16_t sinkPort = 8000;
@@ -100,7 +119,8 @@
 
   // server
   Address sinkLocalAddress (InetSocketAddress (serverIp, sinkPort));
-  PacketSinkHelper sinkHelper ("ns3::TcpSocketFactory", sinkLocalAddress);
+
+  PacketSinkHelper sinkHelper (factory, sinkLocalAddress);
   ApplicationContainer sinkApp = sinkHelper.Install (serverNode);
   sinkApp.Start (Seconds (0.0));
   sinkApp.Stop (Seconds (30.0));
@@ -108,7 +128,7 @@
 
   // client
   AddressValue serverAddress (InetSocketAddress (serverIp, sinkPort));
-  OnOffHelper onoff ("ns3::TcpSocketFactory", Address ());
+  OnOffHelper onoff (factory, Address ());
   onoff.SetAttribute ("Remote", serverAddress);
   onoff.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
   onoff.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
diff -Naur ns-3.22/src/fd-net-device/helper/tap-fd-net-device-helper.cc ns-3.23/src/fd-net-device/helper/tap-fd-net-device-helper.cc
--- ns-3.22/src/fd-net-device/helper/tap-fd-net-device-helper.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/fd-net-device/helper/tap-fd-net-device-helper.cc	2015-05-13 11:05:26.000000000 -0700
@@ -112,7 +112,6 @@
 {
   Ptr<NetDevice> d = FdNetDeviceHelper::InstallPriv (node);
   Ptr<FdNetDevice> device = d->GetObject<FdNetDevice> ();
-  Ptr<FdNetDevice> fdnd = device->GetObject<FdNetDevice> ();
 
   //
   // We need to explicitly set the encapsulation mode for the traffic
@@ -122,7 +121,7 @@
   //
   if (m_modePi)
     {
-      fdnd->SetEncapsulationMode (FdNetDevice::DIXPI);
+      device->SetEncapsulationMode (FdNetDevice::DIXPI);
     }
 
   SetFileDescriptor (device);
diff -Naur ns-3.22/src/fd-net-device/model/fd-net-device.cc ns-3.23/src/fd-net-device/model/fd-net-device.cc
--- ns-3.22/src/fd-net-device/model/fd-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/fd-net-device/model/fd-net-device.cc	2015-05-13 11:05:26.000000000 -0700
@@ -52,6 +52,7 @@
 void
 FdNetDeviceFdReader::SetBufferSize (uint32_t bufferSize)
 {
+  NS_LOG_FUNCTION (this << bufferSize);
   m_bufferSize = bufferSize;
 }
 
@@ -70,7 +71,7 @@
       buf = 0;
       len = 0;
     }
-
+  NS_LOG_LOGIC ("Read " << len << " bytes on fd " << m_fd);
   return FdReader::Data (buf, len);
 }
 
@@ -81,6 +82,7 @@
 {
   static TypeId tid = TypeId ("ns3::FdNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("FdNetDevice")
     .AddConstructor<FdNetDevice> ()
     .AddAttribute ("Address",
                    "The MAC address of this device.",
@@ -246,7 +248,8 @@
   m_nodeId = GetNode ()->GetId ();
 
   m_fdReader = Create<FdNetDeviceFdReader> ();
-  m_fdReader->SetBufferSize(m_mtu);
+  // 22 bytes covers 14 bytes Ethernet header with possible 8 bytes LLC/SNAP
+  m_fdReader->SetBufferSize(m_mtu + 22);  
   m_fdReader->Start (m_fd, MakeCallback (&FdNetDevice::ReceiveCallback, this));
 
   NotifyLinkUp ();
@@ -280,7 +283,7 @@
     CriticalSection cs (m_pendingReadMutex);
     if (m_pendingReadCount >= m_maxPendingReads)
       {
-        //XXX: Packet dropped!
+        NS_LOG_WARN ("Packet dropped");
         skip = true;
       }
     else
@@ -493,8 +496,7 @@
 FdNetDevice::SendFrom (Ptr<Packet> packet, const Address& src, const Address& dest, uint16_t protocolNumber)
 {
   NS_LOG_FUNCTION (this << packet << src << dest << protocolNumber);
-  NS_LOG_LOGIC ("packet " << packet);
-  NS_LOG_LOGIC ("UID is " << packet->GetUid ());
+  NS_LOG_LOGIC ("packet: " << packet << " UID: " << packet->GetUid ());
 
   if (IsLinkUp () == false)
     {
@@ -513,6 +515,8 @@
   header.SetSource (source);
   header.SetDestination (destination);
 
+  NS_ASSERT_MSG (packet->GetSize () <= m_mtu, "FdNetDevice::SendFrom(): Packet too big " << packet->GetSize ());
+
   if (m_encapMode == LLC)
     {
       LlcSnapHeader llc;
@@ -540,7 +544,6 @@
 
   NS_LOG_LOGIC ("calling write");
 
-  NS_ASSERT_MSG (packet->GetSize () <= m_mtu, "FdNetDevice::SendFrom(): Packet too big " << packet->GetSize ());
 
   ssize_t len =  (ssize_t) packet->GetSize ();
   uint8_t *buffer = (uint8_t*)malloc (len);
diff -Naur ns-3.22/src/fd-net-device/test/examples-to-run.py ns-3.23/src/fd-net-device/test/examples-to-run.py
--- ns-3.22/src/fd-net-device/test/examples-to-run.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/fd-net-device/test/examples-to-run.py	2015-05-13 11:05:26.000000000 -0700
@@ -13,7 +13,7 @@
     ("fd-emu-onoff", "False", "True"),
     ("fd-emu-udp-echo", "False", "True"),
     ("realtime-dummy-network", "False", "True"),
-    ("fd2fd-onoff", "False", "True"),
+    ("fd2fd-onoff", "True", "True"),
     ("fd-tap-ping", "False", "True"),
     ("realtime-fd2fd-onoff", "False", "True"),
 ]
diff -Naur ns-3.22/src/flow-monitor/model/flow-monitor.cc ns-3.23/src/flow-monitor/model/flow-monitor.cc
--- ns-3.22/src/flow-monitor/model/flow-monitor.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/flow-monitor/model/flow-monitor.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::FlowMonitor")
     .SetParent<Object> ()
+    .SetGroupName ("FlowMonitor")
     .AddConstructor<FlowMonitor> ()
     .AddAttribute ("MaxPerHopDelay", ("The maximum per-hop delay that should be considered.  "
                                       "Packets still not received after this delay are to be considered lost."),
diff -Naur ns-3.22/src/flow-monitor/model/ipv4-flow-probe.cc ns-3.23/src/flow-monitor/model/ipv4-flow-probe.cc
--- ns-3.22/src/flow-monitor/model/ipv4-flow-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/flow-monitor/model/ipv4-flow-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -108,6 +108,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4FlowProbeTag")
     .SetParent<Tag> ()
+    .SetGroupName ("FlowMonitor")
     .AddConstructor<Ipv4FlowProbeTag> ()
   ;
   return tid;
diff -Naur ns-3.22/src/flow-monitor/model/ipv6-flow-probe.cc ns-3.23/src/flow-monitor/model/ipv6-flow-probe.cc
--- ns-3.22/src/flow-monitor/model/ipv6-flow-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/flow-monitor/model/ipv6-flow-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -109,6 +109,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6FlowProbeTag")
     .SetParent<Tag> ()
+    .SetGroupName ("FlowMonitor")
     .AddConstructor<Ipv6FlowProbeTag> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/bindings/modulegen__gcc_ILP32.py ns-3.23/src/internet/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/internet/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -8893,6 +8893,11 @@
     cls.add_method('EnableChecksums', 
                    'void', 
                    [])
+    ## tcp-header.h (module 'internet'): static std::string ns3::TcpHeader::FlagsToString(uint8_t flags, std::string const & delimiter="|") [member function]
+    cls.add_method('FlagsToString', 
+                   'std::string', 
+                   [param('uint8_t', 'flags'), param('std::string const &', 'delimiter', default_value='"|"')], 
+                   is_static=True)
     ## tcp-header.h (module 'internet'): ns3::SequenceNumber32 ns3::TcpHeader::GetAckNumber() const [member function]
     cls.add_method('GetAckNumber', 
                    'ns3::SequenceNumber32', 
@@ -9755,6 +9760,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
     ## tcp-socket-base.h (module 'internet'): uint32_t ns3::TcpSocketBase::SendDataPacket(ns3::SequenceNumber32 seq, uint32_t maxSize, bool withAck) [member function]
     cls.add_method('SendDataPacket', 
                    'uint32_t', 
@@ -9860,11 +9870,16 @@
                    'uint32_t', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::UpdateWindowSize(ns3::TcpHeader const & header) [member function]
+    cls.add_method('UpdateWindowSize', 
+                   'void', 
+                   [param('ns3::TcpHeader const &', 'header')], 
+                   visibility='protected')
     ## tcp-socket-base.h (module 'internet'): uint32_t ns3::TcpSocketBase::Window() [member function]
     cls.add_method('Window', 
                    'uint32_t', 
                    [], 
-                   visibility='protected', is_virtual=True)
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
     return
 
 def register_Ns3TcpSocketFactory_methods(root_module, cls):
@@ -9929,6 +9944,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-tahoe.h (module 'internet'): void ns3::TcpTahoe::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-tahoe.h (module 'internet'): void ns3::TcpTahoe::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -10073,6 +10093,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -14584,15 +14609,6 @@
                    'ns3::Address', 
                    [], 
                    is_const=True)
-    ## ndisc-cache.h (module 'internet'): uint8_t ns3::NdiscCache::Entry::GetNSRetransmit() const [member function]
-    cls.add_method('GetNSRetransmit', 
-                   'uint8_t', 
-                   [], 
-                   is_const=True)
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::IncNSRetransmit() [member function]
-    cls.add_method('IncNSRetransmit', 
-                   'void', 
-                   [])
     ## ndisc-cache.h (module 'internet'): bool ns3::NdiscCache::Entry::IsDelay() const [member function]
     cls.add_method('IsDelay', 
                    'bool', 
@@ -14651,10 +14667,6 @@
     cls.add_method('MarkStale', 
                    'void', 
                    [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::ResetNSRetransmit() [member function]
-    cls.add_method('ResetNSRetransmit', 
-                   'void', 
-                   [])
     ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::SetIpv6Address(ns3::Ipv6Address ipv6Address) [member function]
     cls.add_method('SetIpv6Address', 
                    'void', 
@@ -14683,20 +14695,8 @@
     cls.add_method('StartRetransmitTimer', 
                    'void', 
                    [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopDelayTimer() [member function]
-    cls.add_method('StopDelayTimer', 
-                   'void', 
-                   [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopProbeTimer() [member function]
-    cls.add_method('StopProbeTimer', 
-                   'void', 
-                   [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopReachableTimer() [member function]
-    cls.add_method('StopReachableTimer', 
-                   'void', 
-                   [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopRetransmitTimer() [member function]
-    cls.add_method('StopRetransmitTimer', 
+    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopNudTimer() [member function]
+    cls.add_method('StopNudTimer', 
                    'void', 
                    [])
     ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::UpdateLastReachabilityconfirmation() [member function]
@@ -15640,6 +15640,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-newreno.h (module 'internet'): void ns3::TcpNewReno::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-newreno.h (module 'internet'): void ns3::TcpNewReno::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -15712,6 +15717,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-reno.h (module 'internet'): void ns3::TcpReno::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-reno.h (module 'internet'): void ns3::TcpReno::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -15764,6 +15774,11 @@
                    'uint32_t', 
                    [], 
                    is_const=True, visibility='protected', is_virtual=True)
+    ## tcp-rfc793.h (module 'internet'): void ns3::TcpRfc793::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-rfc793.h (module 'internet'): void ns3::TcpRfc793::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -15774,6 +15789,11 @@
                    'void', 
                    [param('uint32_t', 'threshold')], 
                    visibility='protected', is_virtual=True)
+    ## tcp-rfc793.h (module 'internet'): uint32_t ns3::TcpRfc793::Window() [member function]
+    cls.add_method('Window', 
+                   'uint32_t', 
+                   [], 
+                   visibility='protected', is_virtual=True)
     return
 
 def register_Ns3TimeValue_methods(root_module, cls):
diff -Naur ns-3.22/src/internet/bindings/modulegen__gcc_LP64.py ns-3.23/src/internet/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/internet/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -8893,6 +8893,11 @@
     cls.add_method('EnableChecksums', 
                    'void', 
                    [])
+    ## tcp-header.h (module 'internet'): static std::string ns3::TcpHeader::FlagsToString(uint8_t flags, std::string const & delimiter="|") [member function]
+    cls.add_method('FlagsToString', 
+                   'std::string', 
+                   [param('uint8_t', 'flags'), param('std::string const &', 'delimiter', default_value='"|"')], 
+                   is_static=True)
     ## tcp-header.h (module 'internet'): ns3::SequenceNumber32 ns3::TcpHeader::GetAckNumber() const [member function]
     cls.add_method('GetAckNumber', 
                    'ns3::SequenceNumber32', 
@@ -9755,6 +9760,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
     ## tcp-socket-base.h (module 'internet'): uint32_t ns3::TcpSocketBase::SendDataPacket(ns3::SequenceNumber32 seq, uint32_t maxSize, bool withAck) [member function]
     cls.add_method('SendDataPacket', 
                    'uint32_t', 
@@ -9860,11 +9870,16 @@
                    'uint32_t', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-socket-base.h (module 'internet'): void ns3::TcpSocketBase::UpdateWindowSize(ns3::TcpHeader const & header) [member function]
+    cls.add_method('UpdateWindowSize', 
+                   'void', 
+                   [param('ns3::TcpHeader const &', 'header')], 
+                   visibility='protected')
     ## tcp-socket-base.h (module 'internet'): uint32_t ns3::TcpSocketBase::Window() [member function]
     cls.add_method('Window', 
                    'uint32_t', 
                    [], 
-                   visibility='protected', is_virtual=True)
+                   is_pure_virtual=True, visibility='protected', is_virtual=True)
     return
 
 def register_Ns3TcpSocketFactory_methods(root_module, cls):
@@ -9929,6 +9944,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-tahoe.h (module 'internet'): void ns3::TcpTahoe::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-tahoe.h (module 'internet'): void ns3::TcpTahoe::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -10073,6 +10093,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-westwood.h (module 'internet'): void ns3::TcpWestwood::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -14584,15 +14609,6 @@
                    'ns3::Address', 
                    [], 
                    is_const=True)
-    ## ndisc-cache.h (module 'internet'): uint8_t ns3::NdiscCache::Entry::GetNSRetransmit() const [member function]
-    cls.add_method('GetNSRetransmit', 
-                   'uint8_t', 
-                   [], 
-                   is_const=True)
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::IncNSRetransmit() [member function]
-    cls.add_method('IncNSRetransmit', 
-                   'void', 
-                   [])
     ## ndisc-cache.h (module 'internet'): bool ns3::NdiscCache::Entry::IsDelay() const [member function]
     cls.add_method('IsDelay', 
                    'bool', 
@@ -14651,10 +14667,6 @@
     cls.add_method('MarkStale', 
                    'void', 
                    [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::ResetNSRetransmit() [member function]
-    cls.add_method('ResetNSRetransmit', 
-                   'void', 
-                   [])
     ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::SetIpv6Address(ns3::Ipv6Address ipv6Address) [member function]
     cls.add_method('SetIpv6Address', 
                    'void', 
@@ -14683,20 +14695,8 @@
     cls.add_method('StartRetransmitTimer', 
                    'void', 
                    [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopDelayTimer() [member function]
-    cls.add_method('StopDelayTimer', 
-                   'void', 
-                   [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopProbeTimer() [member function]
-    cls.add_method('StopProbeTimer', 
-                   'void', 
-                   [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopReachableTimer() [member function]
-    cls.add_method('StopReachableTimer', 
-                   'void', 
-                   [])
-    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopRetransmitTimer() [member function]
-    cls.add_method('StopRetransmitTimer', 
+    ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::StopNudTimer() [member function]
+    cls.add_method('StopNudTimer', 
                    'void', 
                    [])
     ## ndisc-cache.h (module 'internet'): void ns3::NdiscCache::Entry::UpdateLastReachabilityconfirmation() [member function]
@@ -15640,6 +15640,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-newreno.h (module 'internet'): void ns3::TcpNewReno::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-newreno.h (module 'internet'): void ns3::TcpNewReno::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -15712,6 +15717,11 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
+    ## tcp-reno.h (module 'internet'): void ns3::TcpReno::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-reno.h (module 'internet'): void ns3::TcpReno::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -15764,6 +15774,11 @@
                    'uint32_t', 
                    [], 
                    is_const=True, visibility='protected', is_virtual=True)
+    ## tcp-rfc793.h (module 'internet'): void ns3::TcpRfc793::ScaleSsThresh(uint8_t scaleFactor) [member function]
+    cls.add_method('ScaleSsThresh', 
+                   'void', 
+                   [param('uint8_t', 'scaleFactor')], 
+                   visibility='protected', is_virtual=True)
     ## tcp-rfc793.h (module 'internet'): void ns3::TcpRfc793::SetInitialCwnd(uint32_t cwnd) [member function]
     cls.add_method('SetInitialCwnd', 
                    'void', 
@@ -15774,6 +15789,11 @@
                    'void', 
                    [param('uint32_t', 'threshold')], 
                    visibility='protected', is_virtual=True)
+    ## tcp-rfc793.h (module 'internet'): uint32_t ns3::TcpRfc793::Window() [member function]
+    cls.add_method('Window', 
+                   'uint32_t', 
+                   [], 
+                   visibility='protected', is_virtual=True)
     return
 
 def register_Ns3TimeValue_methods(root_module, cls):
diff -Naur ns-3.22/src/internet/helper/ipv4-routing-helper.cc ns-3.23/src/internet/helper/ipv4-routing-helper.cc
--- ns-3.22/src/internet/helper/ipv4-routing-helper.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/helper/ipv4-routing-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -71,19 +71,25 @@
 Ipv4RoutingHelper::Print (Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
 {
   Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
-  Ptr<Ipv4RoutingProtocol> rp = ipv4->GetRoutingProtocol ();
-  NS_ASSERT (rp);
-  rp->PrintRoutingTable (stream);
+  if (ipv4)
+    {
+      Ptr<Ipv4RoutingProtocol> rp = ipv4->GetRoutingProtocol ();
+      NS_ASSERT (rp);
+      rp->PrintRoutingTable (stream);
+    }
 }
 
 void
 Ipv4RoutingHelper::PrintEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
 {
   Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
-  Ptr<Ipv4RoutingProtocol> rp = ipv4->GetRoutingProtocol ();
-  NS_ASSERT (rp);
-  rp->PrintRoutingTable (stream);
-  Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream);
+  if (ipv4)
+    {
+      Ptr<Ipv4RoutingProtocol> rp = ipv4->GetRoutingProtocol ();
+      NS_ASSERT (rp);
+      rp->PrintRoutingTable (stream);
+      Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream);
+    }
 }
 
 void
@@ -121,27 +127,30 @@
 void
 Ipv4RoutingHelper::PrintArpCache (Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
 {
-  std::ostream* os = stream->GetStream ();
-
-  *os << "ARP Cache of node ";
-  std::string found = Names::FindName (node);
-  if (Names::FindName (node) != "")
-    {
-      *os << found;
-    }
-  else
-    {
-      *os << static_cast<int> (node->GetId ());
-    }
-  *os << " at time " << Simulator::Now ().GetSeconds () << "\n";
-
   Ptr<Ipv4L3Protocol> ipv4 = node->GetObject<Ipv4L3Protocol> ();
-  for (uint32_t i=0; i<ipv4->GetNInterfaces(); i++)
+  if (ipv4)
     {
-      Ptr<ArpCache> arpCache = ipv4->GetInterface (i)->GetArpCache ();
-      if (arpCache)
+      std::ostream* os = stream->GetStream ();
+
+      *os << "ARP Cache of node ";
+      std::string found = Names::FindName (node);
+      if (Names::FindName (node) != "")
+        {
+          *os << found;
+        }
+      else
+        {
+          *os << static_cast<int> (node->GetId ());
+        }
+      *os << " at time " << Simulator::Now ().GetSeconds () << "\n";
+
+      for (uint32_t i=0; i<ipv4->GetNInterfaces(); i++)
         {
-          arpCache->PrintArpCache (stream);
+          Ptr<ArpCache> arpCache = ipv4->GetInterface (i)->GetArpCache ();
+          if (arpCache)
+            {
+              arpCache->PrintArpCache (stream);
+            }
         }
     }
 }
@@ -149,30 +158,33 @@
 void
 Ipv4RoutingHelper::PrintArpCacheEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
 {
-  std::ostream* os = stream->GetStream ();
-
-  *os << "ARP Cache of node ";
-  std::string found = Names::FindName (node);
-  if (Names::FindName (node) != "")
-    {
-      *os << found;
-    }
-  else
-    {
-      *os << static_cast<int> (node->GetId ());
-    }
-  *os << " at time " << Simulator::Now ().GetSeconds () << "\n";
-
   Ptr<Ipv4L3Protocol> ipv4 = node->GetObject<Ipv4L3Protocol> ();
-  for (uint32_t i=0; i<ipv4->GetNInterfaces(); i++)
+  if (ipv4)
     {
-      Ptr<ArpCache> arpCache = ipv4->GetInterface (i)->GetArpCache ();
-      if (arpCache)
+      std::ostream* os = stream->GetStream ();
+
+      *os << "ARP Cache of node ";
+      std::string found = Names::FindName (node);
+      if (Names::FindName (node) != "")
         {
-          arpCache->PrintArpCache (stream);
+          *os << found;
         }
+      else
+        {
+          *os << static_cast<int> (node->GetId ());
+        }
+      *os << " at time " << Simulator::Now ().GetSeconds () << "\n";
+
+      for (uint32_t i=0; i<ipv4->GetNInterfaces(); i++)
+        {
+          Ptr<ArpCache> arpCache = ipv4->GetInterface (i)->GetArpCache ();
+          if (arpCache)
+            {
+              arpCache->PrintArpCache (stream);
+            }
+        }
+      Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintArpCacheEvery, printInterval, node, stream);
     }
-  Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintArpCacheEvery, printInterval, node, stream);
 }
 
 } // namespace ns3
diff -Naur ns-3.22/src/internet/helper/ipv6-routing-helper.cc ns-3.23/src/internet/helper/ipv6-routing-helper.cc
--- ns-3.22/src/internet/helper/ipv6-routing-helper.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/helper/ipv6-routing-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -71,19 +71,25 @@
 Ipv6RoutingHelper::Print (Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
 {
   Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();
-  Ptr<Ipv6RoutingProtocol> rp = ipv6->GetRoutingProtocol ();
-  NS_ASSERT (rp);
-  rp->PrintRoutingTable (stream);
+  if (ipv6)
+    {
+      Ptr<Ipv6RoutingProtocol> rp = ipv6->GetRoutingProtocol ();
+      NS_ASSERT (rp);
+      rp->PrintRoutingTable (stream);
+    }
 }
 
 void
 Ipv6RoutingHelper::PrintEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
 {
   Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();
-  Ptr<Ipv6RoutingProtocol> rp = ipv6->GetRoutingProtocol ();
-  NS_ASSERT (rp);
-  rp->PrintRoutingTable (stream);
-  Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream);
+  if (ipv6)
+    {
+      Ptr<Ipv6RoutingProtocol> rp = ipv6->GetRoutingProtocol ();
+      NS_ASSERT (rp);
+      rp->PrintRoutingTable (stream);
+      Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream);
+    }
 }
 
 void
@@ -121,27 +127,30 @@
 void
 Ipv6RoutingHelper::PrintNdiscCache (Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
 {
-  std::ostream* os = stream->GetStream ();
-
-  *os << "NDISC Cache of node ";
-  std::string found = Names::FindName (node);
-  if (Names::FindName (node) != "")
-    {
-      *os << found;
-    }
-  else
-    {
-      *os << static_cast<int> (node->GetId ());
-    }
-  *os << " at time " << Simulator::Now ().GetSeconds () << "\n";
-
   Ptr<Ipv6L3Protocol> ipv6 = node->GetObject<Ipv6L3Protocol> ();
-  for (uint32_t i=0; i<ipv6->GetNInterfaces(); i++)
+  if (ipv6)
     {
-      Ptr<NdiscCache> ndiscCache = ipv6->GetInterface (i)->GetNdiscCache ();
-      if (ndiscCache)
+      std::ostream* os = stream->GetStream ();
+
+      *os << "NDISC Cache of node ";
+      std::string found = Names::FindName (node);
+      if (Names::FindName (node) != "")
+        {
+          *os << found;
+        }
+      else
+        {
+          *os << static_cast<int> (node->GetId ());
+        }
+      *os << " at time " << Simulator::Now ().GetSeconds () << "\n";
+
+      for (uint32_t i=0; i<ipv6->GetNInterfaces(); i++)
         {
-          ndiscCache->PrintNdiscCache (stream);
+          Ptr<NdiscCache> ndiscCache = ipv6->GetInterface (i)->GetNdiscCache ();
+          if (ndiscCache)
+            {
+              ndiscCache->PrintNdiscCache (stream);
+            }
         }
     }
 }
@@ -149,30 +158,33 @@
 void
 Ipv6RoutingHelper::PrintNdiscCacheEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
 {
-  std::ostream* os = stream->GetStream ();
-
-  *os << "NDISC Cache of node ";
-  std::string found = Names::FindName (node);
-  if (Names::FindName (node) != "")
-    {
-      *os << found;
-    }
-  else
-    {
-      *os << static_cast<int> (node->GetId ());
-    }
-  *os << " at time " << Simulator::Now ().GetSeconds () << "\n";
-
   Ptr<Ipv6L3Protocol> ipv6 = node->GetObject<Ipv6L3Protocol> ();
-  for (uint32_t i=0; i<ipv6->GetNInterfaces(); i++)
+  if (ipv6)
     {
-      Ptr<NdiscCache> ndiscCache = ipv6->GetInterface (i)->GetNdiscCache ();
-      if (ndiscCache)
+      std::ostream* os = stream->GetStream ();
+
+      *os << "NDISC Cache of node ";
+      std::string found = Names::FindName (node);
+      if (Names::FindName (node) != "")
         {
-          ndiscCache->PrintNdiscCache (stream);
+          *os << found;
         }
+      else
+        {
+          *os << static_cast<int> (node->GetId ());
+        }
+      *os << " at time " << Simulator::Now ().GetSeconds () << "\n";
+
+      for (uint32_t i=0; i<ipv6->GetNInterfaces(); i++)
+        {
+          Ptr<NdiscCache> ndiscCache = ipv6->GetInterface (i)->GetNdiscCache ();
+          if (ndiscCache)
+            {
+              ndiscCache->PrintNdiscCache (stream);
+            }
+        }
+      Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintNdiscCacheEvery, printInterval, node, stream);
     }
-  Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintNdiscCacheEvery, printInterval, node, stream);
 }
 
 } // namespace ns3
diff -Naur ns-3.22/src/internet/model/arp-cache.cc ns-3.23/src/internet/model/arp-cache.cc
--- ns-3.22/src/internet/model/arp-cache.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/arp-cache.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::ArpCache")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("AliveTimeout",
                    "When this timeout expires, "
                    "the matching cache entry needs refreshing",
diff -Naur ns-3.22/src/internet/model/arp-header.cc ns-3.23/src/internet/model/arp-header.cc
--- ns-3.22/src/internet/model/arp-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/arp-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -98,6 +98,7 @@
 {
   static TypeId tid = TypeId ("ns3::ArpHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<ArpHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/arp-l3-protocol.cc ns-3.23/src/internet/model/arp-l3-protocol.cc
--- ns-3.22/src/internet/model/arp-l3-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/arp-l3-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -46,6 +46,7 @@
   static TypeId tid = TypeId ("ns3::ArpL3Protocol")
     .SetParent<Object> ()
     .AddConstructor<ArpL3Protocol> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("CacheList",
                    "The list of ARP caches",
                    ObjectVectorValue (),
diff -Naur ns-3.22/src/internet/model/codel-queue.cc ns-3.23/src/internet/model/codel-queue.cc
--- ns-3.22/src/internet/model/codel-queue.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/codel-queue.cc	2015-05-13 11:05:27.000000000 -0700
@@ -148,6 +148,7 @@
 {
   static TypeId tid = TypeId ("ns3::CoDelQueue")
     .SetParent<Queue> ()
+    .SetGroupName ("Internet")
     .AddConstructor<CoDelQueue> ()
     .AddAttribute ("Mode",
                    "Whether to use Bytes (see MaxBytes) or Packets (see MaxPackets) as the maximum queue size metric.",
@@ -399,6 +400,12 @@
               // hence the while loop.
               NS_LOG_LOGIC ("Sojourn time is still above target and it's time for next drop; dropping " << p);
               Drop (p);
+
+              // p was in queue, trace dequeue and update stats manually
+              m_traceDequeue (p);
+              m_nBytes -= p->GetSize ();
+              m_nPackets--;
+
               ++m_dropCount;
               ++m_count;
               NewtonStep ();
@@ -444,6 +451,12 @@
           NS_LOG_LOGIC ("Sojourn time goes above target, dropping the first packet " << p << " and entering the dropping state");
           ++m_dropCount;
           Drop (p);
+
+          // p was in queue, trace the dequeue and update stats manually
+          m_traceDequeue (p);
+          m_nBytes -= p->GetSize ();
+          m_nPackets--;
+
           if (m_packets.empty ())
             {
               m_dropping = false;
diff -Naur ns-3.22/src/internet/model/global-router-interface.cc ns-3.23/src/internet/model/global-router-interface.cc
--- ns-3.22/src/internet/model/global-router-interface.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/global-router-interface.cc	2015-05-13 11:05:27.000000000 -0700
@@ -510,7 +510,8 @@
 GlobalRouter::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::GlobalRouter")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Internet");
   return tid;
 }
 
diff -Naur ns-3.22/src/internet/model/icmpv4.cc ns-3.23/src/internet/model/icmpv4.cc
--- ns-3.22/src/internet/model/icmpv4.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/icmpv4.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv4Header")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv4Header> ()
   ;
   return tid;
@@ -198,6 +199,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv4Echo")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv4Echo> ()
   ;
   return tid;
@@ -277,6 +279,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv4DestinationUnreachable")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv4DestinationUnreachable> ()
   ;
   return tid;
@@ -400,6 +403,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv4TimeExceeded")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv4TimeExceeded> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/icmpv4-l4-protocol.cc ns-3.23/src/internet/model/icmpv4-l4-protocol.cc
--- ns-3.22/src/internet/model/icmpv4-l4-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/icmpv4-l4-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -23,6 +23,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv4L4Protocol")
     .SetParent<IpL4Protocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv4L4Protocol> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/icmpv6-header.cc ns-3.23/src/internet/model/icmpv6-header.cc
--- ns-3.22/src/internet/model/icmpv6-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/icmpv6-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6Header")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6Header> ()
   ;
   return tid;
@@ -187,6 +188,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6NS")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6NS> ()
   ;
   return tid;
@@ -300,6 +302,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6NA")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6NA> ()
   ;
   return tid;
@@ -483,6 +486,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6RA")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6RA> ()
   ;
   return tid;
@@ -702,6 +706,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6RS")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6RS> ()
   ;
   return tid;
@@ -792,6 +797,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6Redirection")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6Redirection> ()
   ;
   return tid;
@@ -922,6 +928,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6Echo")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6Echo> ()
   ;
   return tid;
@@ -1039,6 +1046,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6DestinationUnreachable")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6DestinationUnreachable> ()
   ;
   return tid;
@@ -1136,6 +1144,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6TooBig")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6TooBig> ()
   ;
   return tid;
@@ -1246,6 +1255,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6TimeExceeded")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6TimeExceeded> ()
   ;
   return tid;
@@ -1345,6 +1355,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6ParameterError")
     .SetParent<Icmpv6Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6ParameterError> ()
   ;
   return tid;
@@ -1455,6 +1466,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6OptionHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6OptionHeader> ()
   ;
   return tid;
@@ -1533,6 +1545,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6OptionMtu")
     .SetParent<Icmpv6OptionHeader> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6OptionMtu> ()
   ;
   return tid;
@@ -1629,6 +1642,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6OptionPrefixInformation")
     .SetParent<Icmpv6OptionHeader> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6OptionPrefixInformation> ()
   ;
   return tid;
@@ -1802,6 +1816,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6OptionLinkLayerAddress")
     .SetParent<Icmpv6OptionHeader> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6OptionLinkLayerAddress> ()
   ;
   return tid;
@@ -1910,6 +1925,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6OptionRedirected")
     .SetParent<Icmpv6OptionHeader> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6OptionRedirected> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/icmpv6-l4-protocol.cc ns-3.23/src/internet/model/icmpv6-l4-protocol.cc
--- ns-3.22/src/internet/model/icmpv6-l4-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/icmpv6-l4-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -69,6 +69,7 @@
 {
   static TypeId tid = TypeId ("ns3::Icmpv6L4Protocol")
     .SetParent<IpL4Protocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Icmpv6L4Protocol> ()
     .AddAttribute ("DAD", "Always do DAD check.",
                    BooleanValue (true),
@@ -379,10 +380,9 @@
       std::list<Ptr<Packet> > waiting;
       if (entry->IsIncomplete ())
         {
-          entry->StopRetransmitTimer ();
+          entry->StopNudTimer ();
           // mark it to reachable
           waiting = entry->MarkReachable (lla.GetAddress ());
-          entry->StopReachableTimer ();
           entry->StartReachableTimer ();
           // send out waiting packet
           for (std::list<Ptr<Packet> >::const_iterator it = waiting.begin (); it != waiting.end (); it++)
@@ -403,8 +403,7 @@
             {
               if (!entry->IsReachable ())
                 {
-                  entry->StopProbeTimer ();
-                  entry->StopDelayTimer ();
+                  entry->StopNudTimer ();
                   waiting = entry->MarkReachable (lla.GetAddress ());
                   if (entry->IsProbe ())
                     {
@@ -413,7 +412,6 @@
                           cache->GetInterface ()->Send (*it, src);
                         }
                     }
-                  entry->StopReachableTimer ();
                   entry->StartReachableTimer ();
                 }
             }
@@ -664,13 +662,12 @@
   if (entry->IsIncomplete ())
     {
       /* we receive a NA so stop the retransmission timer */
-      entry->StopRetransmitTimer ();
+      entry->StopNudTimer ();
 
       if (naHeader.GetFlagS ())
         {
           /* mark it to reachable */
           waiting = entry->MarkReachable (lla.GetAddress ());
-          entry->StopReachableTimer ();
           entry->StartReachableTimer ();
           /* send out waiting packet */
           for (std::list<Ptr<Packet> >::const_iterator it = waiting.begin (); it != waiting.end (); it++)
@@ -692,8 +689,7 @@
   else
     {
       /* we receive a NA so stop the probe timer or delay timer if any */
-      entry->StopProbeTimer ();
-      entry->StopDelayTimer ();
+      entry->StopNudTimer ();
 
       /* if the Flag O is clear and mac address differs from the cache */
       if (!naHeader.GetFlagO () && lla.GetAddress () != entry->GetMacAddress ())
@@ -728,7 +724,6 @@
                           entry->MarkReachable (lla.GetAddress ());
                         }
                     }
-                  entry->StopReachableTimer ();
                   entry->StartReachableTimer ();
                 }
               else if (lla.GetAddress () != entry->GetMacAddress ())
@@ -823,7 +818,7 @@
   Ptr<Packet> origPkt = unreach.GetPacket ();
 
   Ipv6Header ipHeader;
-  if ( origPkt->GetSerializedSize () > ipHeader.GetSerializedSize () )
+  if ( origPkt->GetSize () > ipHeader.GetSerializedSize () )
     {
       origPkt->RemoveHeader (ipHeader);
       uint8_t payload[8];
diff -Naur ns-3.22/src/internet/model/ip-l4-protocol.cc ns-3.23/src/internet/model/ip-l4-protocol.cc
--- ns-3.22/src/internet/model/ip-l4-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ip-l4-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -36,7 +36,8 @@
 {
   static TypeId tid = TypeId ("ns3::IpL4Protocol")
     .SetParent<Object> ()
-    .AddAttribute ("ProtocolNumber", "The Ip protocol number.",
+    .SetGroupName ("Internet")
+    .AddAttribute ("ProtocolNumber", "The IP protocol number.",
                    UintegerValue (0),
                    MakeUintegerAccessor (&IpL4Protocol::GetProtocolNumber),
                    MakeUintegerChecker<int> ())
diff -Naur ns-3.22/src/internet/model/ipv4.cc ns-3.23/src/internet/model/ipv4.cc
--- ns-3.22/src/internet/model/ipv4.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("IpForward", "Globally enable or disable IP forwarding for all current and future Ipv4 devices.",
                    BooleanValue (true),
                    MakeBooleanAccessor (&Ipv4::SetIpForward,
diff -Naur ns-3.22/src/internet/model/ipv4-global-routing.cc ns-3.23/src/internet/model/ipv4-global-routing.cc
--- ns-3.22/src/internet/model/ipv4-global-routing.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-global-routing.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
 { 
   static TypeId tid = TypeId ("ns3::Ipv4GlobalRouting")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("RandomEcmpRouting",
                    "Set to true if packets are randomly routed among ECMP; set to false for using only one route consistently",
                    BooleanValue (false),
diff -Naur ns-3.22/src/internet/model/ipv4-header.cc ns-3.23/src/internet/model/ipv4-header.cc
--- ns-3.22/src/internet/model/ipv4-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -320,6 +320,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4Header")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv4Header> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ipv4-l3-protocol.cc ns-3.23/src/internet/model/ipv4-l3-protocol.cc
--- ns-3.22/src/internet/model/ipv4-l3-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-l3-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -53,6 +53,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4L3Protocol")
     .SetParent<Ipv4> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv4L3Protocol> ()
     .AddAttribute ("DefaultTos",
                    "The TOS value set by default on "
diff -Naur ns-3.22/src/internet/model/ipv4-list-routing.cc ns-3.23/src/internet/model/ipv4-list-routing.cc
--- ns-3.22/src/internet/model/ipv4-list-routing.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-list-routing.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4ListRouting")
     .SetParent<Ipv4RoutingProtocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv4ListRouting> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ipv4-list-routing.h ns-3.23/src/internet/model/ipv4-list-routing.h
--- ns-3.22/src/internet/model/ipv4-list-routing.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-list-routing.h	2015-05-13 11:05:27.000000000 -0700
@@ -93,8 +93,8 @@
   virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const;
 
 protected:
-  void DoDispose (void);
-  void DoInitialize (void);
+  virtual void DoDispose (void);
+  virtual void DoInitialize (void);
 private:
   /**
    * \brief Container identifying an IPv4 Routing Protocol entry in the list.
diff -Naur ns-3.22/src/internet/model/ipv4-packet-info-tag.cc ns-3.23/src/internet/model/ipv4-packet-info-tag.cc
--- ns-3.22/src/internet/model/ipv4-packet-info-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-packet-info-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -100,6 +100,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4PacketInfoTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv4PacketInfoTag> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ipv4-packet-probe.cc ns-3.23/src/internet/model/ipv4-packet-probe.cc
--- ns-3.22/src/internet/model/ipv4-packet-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-packet-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4PacketProbe")
     .SetParent<Probe> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv4PacketProbe> ()
     .AddTraceSource ( "Output",
                       "The packet plus its IPv4 object and interface "
diff -Naur ns-3.22/src/internet/model/ipv4-raw-socket-factory.cc ns-3.23/src/internet/model/ipv4-raw-socket-factory.cc
--- ns-3.22/src/internet/model/ipv4-raw-socket-factory.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-raw-socket-factory.cc	2015-05-13 11:05:27.000000000 -0700
@@ -31,6 +31,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4RawSocketFactory")
     .SetParent<SocketFactory> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/internet/model/ipv4-raw-socket-impl.cc ns-3.23/src/internet/model/ipv4-raw-socket-impl.cc
--- ns-3.22/src/internet/model/ipv4-raw-socket-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-raw-socket-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -24,6 +24,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4RawSocketImpl")
     .SetParent<Socket> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("Protocol", "Protocol number to match.",
                    UintegerValue (0),
                    MakeUintegerAccessor (&Ipv4RawSocketImpl::m_protocol),
diff -Naur ns-3.22/src/internet/model/ipv4-routing-protocol.cc ns-3.23/src/internet/model/ipv4-routing-protocol.cc
--- ns-3.22/src/internet/model/ipv4-routing-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-routing-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -31,6 +31,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4RoutingProtocol")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/internet/model/ipv4-static-routing.cc ns-3.23/src/internet/model/ipv4-static-routing.cc
--- ns-3.22/src/internet/model/ipv4-static-routing.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv4-static-routing.cc	2015-05-13 11:05:27.000000000 -0700
@@ -47,6 +47,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4StaticRouting")
     .SetParent<Ipv4RoutingProtocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv4StaticRouting> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ipv6.cc ns-3.23/src/internet/model/ipv6.cc
--- ns-3.22/src/internet/model/ipv6.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("IpForward", "Globally enable or disable IP forwarding for all current and future IPv6 devices.",
                    BooleanValue (false),
                    MakeBooleanAccessor (&Ipv6::SetIpForward,
diff -Naur ns-3.22/src/internet/model/ipv6-extension.cc ns-3.23/src/internet/model/ipv6-extension.cc
--- ns-3.22/src/internet/model/ipv6-extension.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-extension.cc	2015-05-13 11:05:27.000000000 -0700
@@ -50,6 +50,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6Extension")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("ExtensionNumber", "The IPv6 extension number.",
                    UintegerValue (0),
                    MakeUintegerAccessor (&Ipv6Extension::GetExtensionNumber),
@@ -192,6 +193,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionHopByHop")
     .SetParent<Ipv6Extension> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6ExtensionHopByHop> ()
   ;
   return tid;
@@ -251,6 +253,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionDestination")
     .SetParent<Ipv6Extension> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6ExtensionDestination> ()
   ;
   return tid;
@@ -310,6 +313,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionFragment")
     .SetParent<Ipv6Extension> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6ExtensionFragment> ()
   ;
   return tid;
@@ -735,6 +739,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionRouting")
     .SetParent<Ipv6Extension> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6ExtensionRouting> ()
   ;
   return tid;
@@ -828,6 +833,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionRoutingDemux")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("Routing Extensions", "The set of IPv6 Routing extensions registered with this demux.",
                    ObjectVectorValue (),
                    MakeObjectVectorAccessor (&Ipv6ExtensionRoutingDemux::m_extensionsRouting),
@@ -890,6 +896,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionLooseRouting")
     .SetParent<Ipv6ExtensionRouting> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6ExtensionLooseRouting> ()
   ;
   return tid;
@@ -1054,6 +1061,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionESP")
     .SetParent<Ipv6Extension> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6ExtensionESP> ()
   ;
   return tid;
@@ -1099,6 +1107,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionAH")
     .SetParent<Ipv6Extension> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6ExtensionAH> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ipv6-extension-demux.cc ns-3.23/src/internet/model/ipv6-extension-demux.cc
--- ns-3.22/src/internet/model/ipv6-extension-demux.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-extension-demux.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionDemux")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("Extensions", "The set of IPv6 extensions registered with this demux.",
                    ObjectVectorValue (),
                    MakeObjectVectorAccessor (&Ipv6ExtensionDemux::m_extensions),
diff -Naur ns-3.22/src/internet/model/ipv6-extension-header.cc ns-3.23/src/internet/model/ipv6-extension-header.cc
--- ns-3.22/src/internet/model/ipv6-extension-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-extension-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionHeader")
     .AddConstructor<Ipv6ExtensionHeader> ()
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -206,6 +207,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionHopByHopHeader")
     .AddConstructor<Ipv6ExtensionHopByHopHeader> ()
     .SetParent<Ipv6ExtensionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -261,6 +263,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionDestinationHeader")
     .AddConstructor<Ipv6ExtensionDestinationHeader> ()
     .SetParent<Ipv6ExtensionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -316,6 +319,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionFragmentHeader")
     .AddConstructor<Ipv6ExtensionFragmentHeader> ()
     .SetParent<Ipv6ExtensionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -409,6 +413,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionRoutingHeader")
     .AddConstructor<Ipv6ExtensionRoutingHeader> ()
     .SetParent<Ipv6ExtensionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -488,6 +493,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionLooseRoutingHeader")
     .AddConstructor<Ipv6ExtensionLooseRoutingHeader> ()
     .SetParent<Ipv6ExtensionRoutingHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -595,6 +601,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionESPHeader")
     .AddConstructor<Ipv6ExtensionESPHeader> ()
     .SetParent<Ipv6ExtensionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -641,6 +648,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6ExtensionAHHeader")
     .AddConstructor<Ipv6ExtensionAHHeader> ()
     .SetParent<Ipv6ExtensionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/internet/model/ipv6-header.cc ns-3.23/src/internet/model/ipv6-header.cc
--- ns-3.22/src/internet/model/ipv6-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -117,6 +117,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6Header")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6Header> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ipv6-interface.cc ns-3.23/src/internet/model/ipv6-interface.cc
--- ns-3.22/src/internet/model/ipv6-interface.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-interface.cc	2015-05-13 11:05:27.000000000 -0700
@@ -42,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6Interface")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/internet/model/ipv6-l3-protocol.cc ns-3.23/src/internet/model/ipv6-l3-protocol.cc
--- ns-3.22/src/internet/model/ipv6-l3-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-l3-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6L3Protocol")
     .SetParent<Ipv6> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6L3Protocol> ()
     .AddAttribute ("DefaultTtl",
                    "The TTL value set by default on all "
diff -Naur ns-3.22/src/internet/model/ipv6-list-routing.cc ns-3.23/src/internet/model/ipv6-list-routing.cc
--- ns-3.22/src/internet/model/ipv6-list-routing.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-list-routing.cc	2015-05-13 11:05:27.000000000 -0700
@@ -36,6 +36,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6ListRouting")
     .SetParent<Ipv6RoutingProtocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6ListRouting> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ipv6-option.cc ns-3.23/src/internet/model/ipv6-option.cc
--- ns-3.22/src/internet/model/ipv6-option.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-option.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6Option")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("OptionNumber", "The IPv6 option number.",
                    UintegerValue (0),
                    MakeUintegerAccessor (&Ipv6Option::GetOptionNumber),
@@ -61,6 +62,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6OptionPad1")
     .SetParent<Ipv6Option> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6OptionPad1> ()
   ;
   return tid;
@@ -105,6 +107,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6OptionPadn")
     .SetParent<Ipv6Option> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6OptionPadn> ()
   ;
   return tid;
@@ -149,6 +152,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6OptionJumbogram")
     .SetParent<Ipv6Option> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6OptionJumbogram> ()
   ;
   return tid;
@@ -193,6 +197,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6OptionRouterAlert")
     .SetParent<Ipv6Option> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6OptionRouterAlert> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ipv6-option-demux.cc ns-3.23/src/internet/model/ipv6-option-demux.cc
--- ns-3.22/src/internet/model/ipv6-option-demux.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-option-demux.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6OptionDemux")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("Options", "The set of IPv6 options registered with this demux.",
                    ObjectVectorValue (),
                    MakeObjectVectorAccessor (&Ipv6OptionDemux::m_options),
diff -Naur ns-3.22/src/internet/model/ipv6-option-header.cc ns-3.23/src/internet/model/ipv6-option-header.cc
--- ns-3.22/src/internet/model/ipv6-option-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-option-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6OptionHeader")
     .AddConstructor<Ipv6OptionHeader> ()
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -123,6 +124,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6OptionPad1Header")
     .AddConstructor<Ipv6OptionPad1Header> ()
     .SetParent<Ipv6OptionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -174,6 +176,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6OptionPadnHeader")
     .AddConstructor<Ipv6OptionPadnHeader> ()
     .SetParent<Ipv6OptionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -234,6 +237,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6OptionJumbogramHeader")
     .AddConstructor<Ipv6OptionJumbogramHeader> ()
     .SetParent<Ipv6OptionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -247,6 +251,7 @@
 {
   SetType (0xC2);
   SetLength (4);
+  m_dataLength = 0;
 }
 
 Ipv6OptionJumbogramHeader::~Ipv6OptionJumbogramHeader ()
@@ -305,6 +310,7 @@
   static TypeId tid = TypeId ("ns3::Ipv6OptionRouterAlertHeader")
     .AddConstructor<Ipv6OptionRouterAlertHeader> ()
     .SetParent<Ipv6OptionHeader> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/internet/model/ipv6-packet-info-tag.cc ns-3.23/src/internet/model/ipv6-packet-info-tag.cc
--- ns-3.22/src/internet/model/ipv6-packet-info-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-packet-info-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -87,6 +87,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6PacketInfoTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6PacketInfoTag> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ipv6-packet-probe.cc ns-3.23/src/internet/model/ipv6-packet-probe.cc
--- ns-3.22/src/internet/model/ipv6-packet-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-packet-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6PacketProbe")
     .SetParent<Probe> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6PacketProbe> ()
     .AddTraceSource ( "Output",
                       "The packet plus its IPv6 object and interface "
diff -Naur ns-3.22/src/internet/model/ipv6-pmtu-cache.cc ns-3.23/src/internet/model/ipv6-pmtu-cache.cc
--- ns-3.22/src/internet/model/ipv6-pmtu-cache.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-pmtu-cache.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6PmtuCache")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("CacheExpiryTime",
                    "Validity time for a Path MTU entry. Default is 10 minutes, minimum is 5 minutes.",
                    TimeValue (Seconds (60 * 10)),
diff -Naur ns-3.22/src/internet/model/ipv6-raw-socket-factory.cc ns-3.23/src/internet/model/ipv6-raw-socket-factory.cc
--- ns-3.22/src/internet/model/ipv6-raw-socket-factory.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-raw-socket-factory.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6RawSocketFactory")
     .SetParent<SocketFactory> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/internet/model/ipv6-raw-socket-impl.cc ns-3.23/src/internet/model/ipv6-raw-socket-impl.cc
--- ns-3.22/src/internet/model/ipv6-raw-socket-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-raw-socket-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -46,6 +46,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6RawSocketImpl")
     .SetParent<Socket> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("Protocol", "Protocol number to match.", 
                    UintegerValue (0),
                    MakeUintegerAccessor (&Ipv6RawSocketImpl::m_protocol),
diff -Naur ns-3.22/src/internet/model/ipv6-routing-protocol.cc ns-3.23/src/internet/model/ipv6-routing-protocol.cc
--- ns-3.22/src/internet/model/ipv6-routing-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-routing-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6RoutingProtocol")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/internet/model/ipv6-static-routing.cc ns-3.23/src/internet/model/ipv6-static-routing.cc
--- ns-3.22/src/internet/model/ipv6-static-routing.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ipv6-static-routing.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv6StaticRouting")
     .SetParent<Ipv6RoutingProtocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<Ipv6StaticRouting> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/loopback-net-device.cc ns-3.23/src/internet/model/loopback-net-device.cc
--- ns-3.22/src/internet/model/loopback-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/loopback-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::LoopbackNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Internet")
     .AddConstructor<LoopbackNetDevice> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/ndisc-cache.cc ns-3.23/src/internet/model/ndisc-cache.cc
--- ns-3.22/src/internet/model/ndisc-cache.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ndisc-cache.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::NdiscCache")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("UnresolvedQueueSize",
                    "Size of the queue for packets pending an NA reply.",
                    UintegerValue (DEFAULT_UNRES_QLEN),
@@ -197,10 +198,7 @@
   : m_ndCache (nd),
     m_waiting (),
     m_router (false),
-    m_reachableTimer (Timer::CANCEL_ON_DESTROY),
-    m_retransTimer (Timer::CANCEL_ON_DESTROY),
-    m_probeTimer (Timer::CANCEL_ON_DESTROY),
-    m_delayTimer (Timer::CANCEL_ON_DESTROY),
+    m_nudTimer (Timer::CANCEL_ON_DESTROY),
     m_lastReachabilityConfirmation (Seconds (0.0)),
     m_nsRetransmit (0)
 {
@@ -268,9 +266,9 @@
         }
     }
 
-  if (GetNSRetransmit () < icmpv6->MAX_MULTICAST_SOLICIT)
+  if (m_nsRetransmit < icmpv6->MAX_MULTICAST_SOLICIT)
     {
-      IncNSRetransmit ();
+      m_nsRetransmit++;
 
       icmpv6->SendNS (addr, Ipv6Address::MakeSolicitedAddress (m_ipv6Address), m_ipv6Address, m_ndCache->GetDevice ()->GetAddress ());
       /* arm the timer again */
@@ -323,8 +321,7 @@
   Ptr<Packet> p = icmpv6->ForgeNS (addr, m_ipv6Address, m_ipv6Address, m_ndCache->GetDevice ()->GetAddress ());
   m_ndCache->GetDevice ()->Send (p, this->GetMacAddress (), Ipv6L3Protocol::PROT_NUMBER);
 
-  ResetNSRetransmit ();
-  IncNSRetransmit ();
+  m_nsRetransmit = 1;
   StartProbeTimer ();
 }
 
@@ -334,8 +331,10 @@
   Ptr<Ipv6L3Protocol> ipv6 = m_ndCache->GetDevice ()->GetNode ()->GetObject<Ipv6L3Protocol> ();
   Ptr<Icmpv6L4Protocol> icmpv6 = ipv6->GetIcmpv6 ();
 
-  if (GetNSRetransmit () < icmpv6->MAX_UNICAST_SOLICIT)
+  if (m_nsRetransmit < icmpv6->MAX_UNICAST_SOLICIT)
     {
+      m_nsRetransmit++;
+
       Ipv6Address addr;
 
       if (m_ipv6Address.IsLinkLocal ())
@@ -358,7 +357,6 @@
           return;
         }
 
-      IncNSRetransmit ();
       /* icmpv6->SendNS (m_ndCache->GetInterface ()->GetLinkLocalAddress (), m_ipv6Address, m_ipv6Address, m_ndCache->GetDevice ()->GetAddress ()); */
       Ptr<Packet> p = icmpv6->ForgeNS (addr, m_ipv6Address, m_ipv6Address, m_ndCache->GetDevice ()->GetAddress ());
       m_ndCache->GetDevice ()->Send (p, this->GetMacAddress (), Ipv6L3Protocol::PROT_NUMBER);
@@ -379,24 +377,6 @@
   m_ipv6Address = ipv6Address;
 }
 
-uint8_t NdiscCache::Entry::GetNSRetransmit () const
-{
-  NS_LOG_FUNCTION_NOARGS ();
-  return m_nsRetransmit;
-}
-
-void NdiscCache::Entry::IncNSRetransmit ()
-{
-  NS_LOG_FUNCTION_NOARGS ();
-  m_nsRetransmit++;
-}
-
-void NdiscCache::Entry::ResetNSRetransmit ()
-{
-  NS_LOG_FUNCTION_NOARGS ();
-  m_nsRetransmit = 0;
-}
-
 Time NdiscCache::Entry::GetLastReachabilityConfirmation () const
 {
   NS_LOG_FUNCTION_NOARGS ();
@@ -411,77 +391,57 @@
 void NdiscCache::Entry::StartReachableTimer ()
 {
   NS_LOG_FUNCTION_NOARGS ();
-  if (m_reachableTimer.IsRunning ())
+  if (m_nudTimer.IsRunning ())
     {
-      m_reachableTimer.Cancel ();
+      m_nudTimer.Cancel ();
     }
-  m_reachableTimer.SetFunction (&NdiscCache::Entry::FunctionReachableTimeout, this);
-  m_reachableTimer.SetDelay (MilliSeconds (Icmpv6L4Protocol::REACHABLE_TIME));
-  m_reachableTimer.Schedule ();
-}
 
-void NdiscCache::Entry::StopReachableTimer ()
-{
-  NS_LOG_FUNCTION_NOARGS ();
-  m_reachableTimer.Cancel ();
+  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionReachableTimeout, this);
+  m_nudTimer.SetDelay (MilliSeconds (Icmpv6L4Protocol::REACHABLE_TIME));
+  m_nudTimer.Schedule ();
 }
 
 void NdiscCache::Entry::StartProbeTimer ()
 {
   NS_LOG_FUNCTION_NOARGS ();
-  if (m_probeTimer.IsRunning ())
+  if (m_nudTimer.IsRunning ())
     {
-      m_probeTimer.Cancel ();
+      m_nudTimer.Cancel ();
     }
-  m_probeTimer.SetFunction (&NdiscCache::Entry::FunctionProbeTimeout, this);
-  m_probeTimer.SetDelay (MilliSeconds (Icmpv6L4Protocol::RETRANS_TIMER));
-  m_probeTimer.Schedule ();
-}
-
-void NdiscCache::Entry::StopProbeTimer ()
-{
-  NS_LOG_FUNCTION_NOARGS ();
-  m_probeTimer.Cancel ();
-  ResetNSRetransmit ();
+  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionProbeTimeout, this);
+  m_nudTimer.SetDelay (MilliSeconds (Icmpv6L4Protocol::RETRANS_TIMER));
+  m_nudTimer.Schedule ();
 }
 
-
 void NdiscCache::Entry::StartDelayTimer ()
 {
   NS_LOG_FUNCTION_NOARGS ();
-  if (m_delayTimer.IsRunning ())
+  if (m_nudTimer.IsRunning ())
     {
-      m_delayTimer.Cancel ();
+      m_nudTimer.Cancel ();
     }
-  m_delayTimer.SetFunction (&NdiscCache::Entry::FunctionDelayTimeout, this);
-  m_delayTimer.SetDelay (Seconds (Icmpv6L4Protocol::DELAY_FIRST_PROBE_TIME));
-  m_delayTimer.Schedule ();
-}
-
-void NdiscCache::Entry::StopDelayTimer ()
-{
-  NS_LOG_FUNCTION_NOARGS ();
-  m_delayTimer.Cancel ();
-  ResetNSRetransmit ();
+  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionDelayTimeout, this);
+  m_nudTimer.SetDelay (Seconds (Icmpv6L4Protocol::DELAY_FIRST_PROBE_TIME));
+  m_nudTimer.Schedule ();
 }
 
 void NdiscCache::Entry::StartRetransmitTimer ()
 {
   NS_LOG_FUNCTION_NOARGS ();
-  if (m_retransTimer.IsRunning ())
+  if (m_nudTimer.IsRunning ())
     {
-      m_retransTimer.Cancel ();
+      m_nudTimer.Cancel ();
     }
-  m_retransTimer.SetFunction (&NdiscCache::Entry::FunctionRetransmitTimeout, this);
-  m_retransTimer.SetDelay (MilliSeconds (Icmpv6L4Protocol::RETRANS_TIMER));
-  m_retransTimer.Schedule ();
+  m_nudTimer.SetFunction (&NdiscCache::Entry::FunctionRetransmitTimeout, this);
+  m_nudTimer.SetDelay (MilliSeconds (Icmpv6L4Protocol::RETRANS_TIMER));
+  m_nudTimer.Schedule ();
 }
 
-void NdiscCache::Entry::StopRetransmitTimer ()
+void NdiscCache::Entry::StopNudTimer ()
 {
   NS_LOG_FUNCTION_NOARGS ();
-  m_retransTimer.Cancel ();
-  ResetNSRetransmit ();
+  m_nudTimer.Cancel ();
+  m_nsRetransmit = 0;
 }
 
 void NdiscCache::Entry::MarkIncomplete (Ptr<Packet> p)
@@ -573,7 +533,7 @@
 
 void NdiscCache::Entry::SetMacAddress (Address mac)
 {
-  NS_LOG_FUNCTION (this << mac);
+  NS_LOG_FUNCTION (this << mac << int(m_state));
   m_macAddress = mac;
 }
 
diff -Naur ns-3.22/src/internet/model/ndisc-cache.h ns-3.23/src/internet/model/ndisc-cache.h
--- ns-3.22/src/internet/model/ndisc-cache.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ndisc-cache.h	2015-05-13 11:05:27.000000000 -0700
@@ -250,22 +250,6 @@
     void SetRouter (bool router);
 
     /**
-     * \brief Get the number of NS retransmit.
-     * \return number of NS that have been retransmit
-     */
-    uint8_t GetNSRetransmit () const;
-
-    /**
-     * \brief Increment NS retransmit.
-     */
-    void IncNSRetransmit ();
-
-    /**
-     * \brief Reset NS retransmit (=0).
-     */
-    void ResetNSRetransmit ();
-
-    /**
      * \brief Get the time of last reachability confirmation.
      * \return time
      */
@@ -282,39 +266,24 @@
     void StartReachableTimer ();
 
     /**
-     * \brief Stop the reachable timer.
-     */
-    void StopReachableTimer ();
-
-    /**
      * \brief Start retransmit timer.
      */
     void StartRetransmitTimer ();
 
     /**
-     * \brief Stop retransmit timer.
-     */
-    void StopRetransmitTimer ();
-
-    /**
      * \brief Start probe timer.
      */
     void StartProbeTimer ();
 
     /**
-     * \brief Stop probe timer.
-     */
-    void StopProbeTimer ();
-
-    /**
      * \brief Start delay timer.
      */
     void StartDelayTimer ();
 
     /**
-     * \brief Stop delay timer.
+     * \brief Stop NUD timer and reset the NUD retransmission counter
      */
-    void StopDelayTimer ();
+    void StopNudTimer ();
 
     /**
      * \brief Function called when reachable timer timeout.
@@ -388,24 +357,9 @@
     bool m_router;
 
     /**
-     * \brief Reachable timer (used for NUD in REACHABLE state).
-     */
-    Timer m_reachableTimer;
-
-    /**
-     * \brief Retransmission timer (used for NUD in INCOMPLETE state).
-     */
-    Timer m_retransTimer;
-
-    /**
-     * \brief Probe timer (used for NUD in PROBE state).
-     */
-    Timer m_probeTimer;
-
-    /**
-     * \brief Delay timer (used for NUD when in DELAY state).
+     * \brief Timer (used for NUD).
      */
-    Timer m_delayTimer;
+    Timer m_nudTimer;
 
     /**
      * \brief Last time we see a reachability confirmation.
diff -Naur ns-3.22/src/internet/model/nsc-tcp-l4-protocol.cc ns-3.23/src/internet/model/nsc-tcp-l4-protocol.cc
--- ns-3.22/src/internet/model/nsc-tcp-l4-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/nsc-tcp-l4-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -126,6 +126,7 @@
 {
   static TypeId tid = TypeId ("ns3::NscTcpL4Protocol")
     .SetParent<IpL4Protocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<NscTcpL4Protocol>()
     .AddAttribute ("SocketList", "The list of sockets associated to this protocol.",
                    ObjectVectorValue (),
diff -Naur ns-3.22/src/internet/model/nsc-tcp-socket-impl.cc ns-3.23/src/internet/model/nsc-tcp-socket-impl.cc
--- ns-3.22/src/internet/model/nsc-tcp-socket-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/nsc-tcp-socket-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -54,6 +54,7 @@
 {
   static TypeId tid = TypeId ("ns3::NscTcpSocketImpl")
     .SetParent<TcpSocket> ()
+    .SetGroupName ("Internet")
     .AddTraceSource ("CongestionWindow",
                      "The TCP connection's congestion window",
                      MakeTraceSourceAccessor (&NscTcpSocketImpl::m_cWnd),
diff -Naur ns-3.22/src/internet/model/ripng.cc ns-3.23/src/internet/model/ripng.cc
--- ns-3.22/src/internet/model/ripng.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ripng.cc	2015-05-13 11:05:27.000000000 -0700
@@ -57,6 +57,7 @@
 {
   static TypeId tid = TypeId ("ns3::RipNg")
     .SetParent<Ipv6RoutingProtocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<RipNg> ()
     .AddAttribute ("UnsolicitedRoutingUpdate", "The time between two Unsolicited Routing Updates.",
                    TimeValue (Seconds(30)),
@@ -246,6 +247,15 @@
           NS_LOG_LOGIC ("Address " << addr << " not a match");
         }
     }
+
+  if (header.GetDestinationAddress ().IsLinkLocal () ||
+      header.GetSourceAddress ().IsLinkLocal ())
+    {
+      NS_LOG_LOGIC ("Dropping packet not for me and with src or dst LinkLocal");
+      ecb (p, header, Socket::ERROR_NOROUTETOHOST);
+      return false;
+    }
+
   // Check if input device supports IP forwarding
   if (m_ipv6->IsForwarding (iif) == false)
     {
@@ -259,13 +269,13 @@
 
   if (rtentry != 0)
     {
-      NS_LOG_LOGIC ("Found unicast destination- calling unicast callback");
+      NS_LOG_LOGIC ("Found unicast destination - calling unicast callback");
       ucb (idev, rtentry, p, header);  // unicast forwarding callback
       return true;
     }
   else
     {
-      NS_LOG_LOGIC ("Did not find unicast destination- returning false");
+      NS_LOG_LOGIC ("Did not find unicast destination - returning false");
       return false; // Let other routing protocols try to handle this
     }
 }
@@ -282,15 +292,7 @@
 
       if (address != Ipv6Address () && networkMask != Ipv6Prefix ())
         {
-          if (networkMask == Ipv6Prefix (128))
-            {
-              /* host route */
-              AddNetworkRouteTo (networkAddress, Ipv6Prefix::GetOnes (), 0);
-            }
-          else
-            {
-              AddNetworkRouteTo (networkAddress, networkMask, i);
-            }
+          AddNetworkRouteTo (networkAddress, networkMask, i);
         }
     }
 
@@ -320,10 +322,6 @@
     {
       Ipv6InterfaceAddress address = m_ipv6->GetAddress (i, j);
 
-      Ipv6Address networkAddress = address.GetAddress ().CombinePrefix (address.GetPrefix ());
-      Ipv6Prefix networkMask = address.GetPrefix ();
-      AddNetworkRouteTo (networkAddress, networkMask, i);
-
       if (address.GetScope() == Ipv6InterfaceAddress::LINKLOCAL && sendSocketFound == false && activeInterface == true)
         {
           NS_LOG_LOGIC ("RIPng: adding sending socket to " << address.GetAddress ());
diff -Naur ns-3.22/src/internet/model/ripng-header.cc ns-3.23/src/internet/model/ripng-header.cc
--- ns-3.22/src/internet/model/ripng-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/ripng-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,7 +35,10 @@
 
 TypeId RipNgRte::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::RipNgRte").SetParent<Header> ().AddConstructor<RipNgRte> ();
+  static TypeId tid = TypeId ("ns3::RipNgRte")
+    .SetParent<Header> ()
+    .SetGroupName ("Internet")
+    .AddConstructor<RipNgRte> ();
   return tid;
 }
 
@@ -139,7 +142,10 @@
 
 TypeId RipNgHeader::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::RipNgHeader").SetParent<Header> ().AddConstructor<RipNgHeader> ();
+  static TypeId tid = TypeId ("ns3::RipNgHeader")
+    .SetParent<Header> ()
+    .SetGroupName ("Internet")
+    .AddConstructor<RipNgHeader> ();
   return tid;
 }
 
diff -Naur ns-3.22/src/internet/model/rtt-estimator.cc ns-3.23/src/internet/model/rtt-estimator.cc
--- ns-3.22/src/internet/model/rtt-estimator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/rtt-estimator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::RttEstimator")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("InitialEstimation", 
                    "Initial RTT estimate",
                    TimeValue (Seconds (1.0)),
@@ -129,6 +130,7 @@
 {
   static TypeId tid = TypeId ("ns3::RttMeanDeviation")
     .SetParent<RttEstimator> ()
+    .SetGroupName ("Internet")
     .AddConstructor<RttMeanDeviation> ()
     .AddAttribute ("Alpha",
                    "Gain used in estimating the RTT, must be 0 <= alpha <= 1",
@@ -170,23 +172,23 @@
       return 0;
     }
   // supports 1/32, 1/16, 1/8, 1/4, 1/2
-  if (abs (1/val - 8) < TOLERANCE)
+  if (std::abs (1/val - 8) < TOLERANCE)
     {
       return 3;
     }
-  if (abs (1/val - 4) < TOLERANCE)
+  if (std::abs (1/val - 4) < TOLERANCE)
     {
       return 2;
     }
-  if (abs (1/val - 32) < TOLERANCE)
+  if (std::abs (1/val - 32) < TOLERANCE)
     {
       return 5;
     }
-  if (abs (1/val - 16) < TOLERANCE)
+  if (std::abs (1/val - 16) < TOLERANCE)
     {
       return 4;
     }
-  if (abs (1/val - 2) < TOLERANCE)
+  if (std::abs (1/val - 2) < TOLERANCE)
     {
       return 1;
     }
diff -Naur ns-3.22/src/internet/model/tcp-header.cc ns-3.23/src/internet/model/tcp-header.cc
--- ns-3.22/src/internet/model/tcp-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -51,6 +51,34 @@
 {
 }
 
+std::string
+TcpHeader::FlagsToString (uint8_t flags, const std::string& delimiter)
+{
+  static const char* flagNames[8] = {
+    "FIN",
+    "SYN",
+    "RST",
+    "PSH",
+    "ACK",
+    "URG",
+    "ECE",
+    "CWR"
+  };
+  std::string flagsDescription = "";
+  for (uint8_t i = 0; i < 8; ++i)
+    {
+      if (flags & (1 << i))
+        {
+          if (flagsDescription.length() > 0) 
+            {
+              flagsDescription += delimiter;
+            }
+          flagsDescription.append (flagNames[i]);
+        }
+    }
+  return flagsDescription;
+}
+
 void
 TcpHeader::EnableChecksums (void)
 {
@@ -231,6 +259,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpHeader> ()
   ;
   return tid;
@@ -249,41 +278,7 @@
 
   if (m_flags != 0)
     {
-      os<<" [";
-      if ((m_flags & FIN) != 0)
-        {
-          os<<" FIN ";
-        }
-      if ((m_flags & SYN) != 0)
-        {
-          os<<" SYN ";
-        }
-      if ((m_flags & RST) != 0)
-        {
-          os<<" RST ";
-        }
-      if ((m_flags & PSH) != 0)
-        {
-          os<<" PSH ";
-        }
-      if ((m_flags & ACK) != 0)
-        {
-          os<<" ACK ";
-        }
-      if ((m_flags & URG) != 0)
-        {
-          os<<" URG ";
-        }
-      if ((m_flags & ECE) != 0)
-        {
-          os<<" ECE ";
-        }
-      if ((m_flags & CWR) != 0)
-        {
-          os<<" CWR ";
-        }
-
-      os<<"]";
+      os<<" [" << FlagsToString(m_flags) <<"]";
     }
 
   os<<" Seq="<<m_sequenceNumber<<" Ack="<<m_ackNumber<<" Win="<<m_windowSize;
diff -Naur ns-3.22/src/internet/model/tcp-header.h ns-3.23/src/internet/model/tcp-header.h
--- ns-3.22/src/internet/model/tcp-header.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-header.h	2015-05-13 11:05:27.000000000 -0700
@@ -41,13 +41,30 @@
  * as methods for serialization to and deserialization from a byte buffer.
  */
 
-class TcpHeader : public Header 
+class TcpHeader : public Header
 {
 public:
   TcpHeader ();
   virtual ~TcpHeader ();
 
   /**
+   * \brief Converts an integer into a human readable list of Tcp flags
+   *
+   * \param flags Bitfield of TCP flags to convert to a readable string
+   * \param delimiter String to insert between flags
+   *
+   * FIN=0x1, SYN=0x2, RST=0x4, PSH=0x8, ACK=0x10, URG=0x20, ECE=0x40, CWR=0x80
+   * TcpHeader::FlagsToString (0x1) should return the following string;
+   *     "FIN"
+   *
+   * TcpHeader::FlagsToString (0xff) should return the following string;
+   *     "FIN|SYN|RST|PSH|ACK|URG|ECE|CWR";
+   *
+   * \return the generated string
+   **/
+  static std::string FlagsToString (uint8_t flags, const std::string& delimiter = "|");
+
+  /**
    * \brief Enable checksum calculation for TCP
    *
    * \todo currently has no effect
diff -Naur ns-3.22/src/internet/model/tcp-l4-protocol.cc ns-3.23/src/internet/model/tcp-l4-protocol.cc
--- ns-3.22/src/internet/model/tcp-l4-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-l4-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -67,6 +67,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpL4Protocol")
     .SetParent<IpL4Protocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpL4Protocol> ()
     .AddAttribute ("RttEstimatorType",
                    "Type of RttEstimator objects.",
diff -Naur ns-3.22/src/internet/model/tcp-newreno.cc ns-3.23/src/internet/model/tcp-newreno.cc
--- ns-3.22/src/internet/model/tcp-newreno.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-newreno.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpNewReno")
     .SetParent<TcpSocketBase> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpNewReno> ()
     .AddAttribute ("ReTxThreshold", "Threshold for fast retransmit",
                     UintegerValue (3),
@@ -182,7 +183,10 @@
     { // Increase cwnd for every additional dupack (RFC2582, sec.3 bullet #3)
       m_cWnd += m_segmentSize;
       NS_LOG_INFO ("Dupack in fast recovery mode. Increase cwnd to " << m_cWnd);
-      SendPendingData (m_connected);
+      if (!m_sendPendingDataEvent.IsRunning ())
+        {
+          SendPendingData (m_connected);
+        }
     }
   else if (!m_inFastRec && m_limitedTx && m_txBuffer->SizeFromSequence (m_nextTxSequence) > 0)
     { // RFC3042 Limited transmit: Send a new packet for each duplicated ACK before fast retransmit
@@ -261,4 +265,10 @@
   m_ssThresh = m_initialSsThresh;
 }
 
+void
+TcpNewReno::ScaleSsThresh (uint8_t scaleFactor)
+{
+  m_ssThresh <<= scaleFactor;
+}
+
 } // namespace ns3
diff -Naur ns-3.22/src/internet/model/tcp-newreno.h ns-3.23/src/internet/model/tcp-newreno.h
--- ns-3.22/src/internet/model/tcp-newreno.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-newreno.h	2015-05-13 11:05:27.000000000 -0700
@@ -69,6 +69,8 @@
   virtual uint32_t GetInitialSSThresh (void) const;
   virtual void     SetInitialCwnd (uint32_t cwnd);
   virtual uint32_t GetInitialCwnd (void) const;
+  virtual void ScaleSsThresh (uint8_t scaleFactor);
+
 private:
   /**
    * \brief Set the congestion window when connection starts
diff -Naur ns-3.22/src/internet/model/tcp-option.cc ns-3.23/src/internet/model/tcp-option.cc
--- ns-3.22/src/internet/model/tcp-option.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-option.cc	2015-05-13 11:05:27.000000000 -0700
@@ -48,6 +48,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpOption")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
@@ -125,6 +126,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpOptionUnknown")
     .SetParent<TcpOption> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpOptionUnknown> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/tcp-option-rfc793.cc ns-3.23/src/internet/model/tcp-option-rfc793.cc
--- ns-3.22/src/internet/model/tcp-option-rfc793.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-option-rfc793.cc	2015-05-13 11:05:27.000000000 -0700
@@ -43,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpOptionEnd")
     .SetParent<TcpOption> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpOptionEnd> ()
   ;
   return tid;
@@ -114,6 +115,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpOptionNOP")
     .SetParent<TcpOption> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpOptionNOP> ()
   ;
   return tid;
@@ -184,6 +186,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpOptionMSS")
     .SetParent<TcpOption> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpOptionMSS> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/tcp-option-ts.cc ns-3.23/src/internet/model/tcp-option-ts.cc
--- ns-3.22/src/internet/model/tcp-option-ts.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-option-ts.cc	2015-05-13 11:05:27.000000000 -0700
@@ -43,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpOptionTS")
     .SetParent<TcpOption> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpOptionTS> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/tcp-option-winscale.cc ns-3.23/src/internet/model/tcp-option-winscale.cc
--- ns-3.22/src/internet/model/tcp-option-winscale.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-option-winscale.cc	2015-05-13 11:05:27.000000000 -0700
@@ -43,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpOptionWinScale")
     .SetParent<TcpOption> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpOptionWinScale> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/tcp-reno.cc ns-3.23/src/internet/model/tcp-reno.cc
--- ns-3.22/src/internet/model/tcp-reno.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-reno.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpReno")
     .SetParent<TcpSocketBase> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpReno> ()
     .AddAttribute ("ReTxThreshold", "Threshold for fast retransmit",
                     UintegerValue (3),
@@ -164,7 +165,10 @@
     { // In fast recovery, inc cwnd for every additional dupack (RFC2581, sec.3.2)
       m_cWnd += m_segmentSize;
       NS_LOG_INFO ("Increased cwnd to " << m_cWnd);
-      SendPendingData (m_connected);
+      if (!m_sendPendingDataEvent.IsRunning ())
+        {
+          SendPendingData (m_connected);
+        }
     };
 }
 
@@ -236,4 +240,11 @@
   m_ssThresh = m_initialSsThresh;
 }
 
+void
+TcpReno::ScaleSsThresh (uint8_t scaleFactor)
+{
+  m_ssThresh <<= scaleFactor;
+}
+
+
 } // namespace ns3
diff -Naur ns-3.22/src/internet/model/tcp-reno.h ns-3.23/src/internet/model/tcp-reno.h
--- ns-3.22/src/internet/model/tcp-reno.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-reno.h	2015-05-13 11:05:27.000000000 -0700
@@ -71,6 +71,8 @@
   virtual uint32_t GetInitialSSThresh (void) const;
   virtual void     SetInitialCwnd (uint32_t cwnd);
   virtual uint32_t GetInitialCwnd (void) const;
+  virtual void ScaleSsThresh (uint8_t scaleFactor);
+
 private:
   /**
    * \brief Set the congestion window when connection starts
diff -Naur ns-3.22/src/internet/model/tcp-rfc793.cc ns-3.23/src/internet/model/tcp-rfc793.cc
--- ns-3.22/src/internet/model/tcp-rfc793.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-rfc793.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpRfc793")
     .SetParent<TcpSocketBase> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpRfc793> ()
   ;
   return tid;
@@ -88,4 +89,19 @@
   return 0;
 }
 
+uint32_t
+TcpRfc793::Window ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_rWnd;
+}
+
+void
+TcpRfc793::ScaleSsThresh (uint8_t scaleFactor)
+{
+  NS_LOG_WARN ("DoD TCP does not perform slow start");
+  return;
+}
+
+
 } // namespace ns3
diff -Naur ns-3.22/src/internet/model/tcp-rfc793.h ns-3.23/src/internet/model/tcp-rfc793.h
--- ns-3.22/src/internet/model/tcp-rfc793.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-rfc793.h	2015-05-13 11:05:27.000000000 -0700
@@ -62,6 +62,10 @@
   virtual uint32_t GetInitialSSThresh (void) const;
   virtual void     SetInitialCwnd (uint32_t cwnd);
   virtual uint32_t GetInitialCwnd (void) const;
+
+  virtual uint32_t Window (void);
+  virtual void ScaleSsThresh (uint8_t scaleFactor);
+
 };
 
 } // namespace ns3
diff -Naur ns-3.22/src/internet/model/tcp-rx-buffer.cc ns-3.23/src/internet/model/tcp-rx-buffer.cc
--- ns-3.22/src/internet/model/tcp-rx-buffer.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-rx-buffer.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpRxBuffer")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpRxBuffer> ()
     .AddTraceSource ("NextRxSequence",
                      "Next sequence number expected (RCV.NXT)",
diff -Naur ns-3.22/src/internet/model/tcp-socket-base.cc ns-3.23/src/internet/model/tcp-socket-base.cc
--- ns-3.22/src/internet/model/tcp-socket-base.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-socket-base.cc	2015-05-13 11:05:27.000000000 -0700
@@ -65,6 +65,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpSocketBase")
     .SetParent<TcpSocket> ()
+    .SetGroupName ("Internet")
 //    .AddAttribute ("TcpState", "State in TCP state machine",
 //                   TypeId::ATTR_GET,
 //                   EnumValue (CLOSED),
@@ -97,7 +98,7 @@
                    MakeBooleanChecker ())
     .AddAttribute ("MinRto",
                    "Minimum retransmit timeout value",
-                   TimeValue (Seconds (0.2)), // RFC2988 says min RTO=1 sec, but Linux uses 200ms. See http://www.postel.org/pipermail/end2end-interest/2004-November/004402.html
+                   TimeValue (Seconds (1.0)), // RFC 6298 says min RTO=1 sec, but Linux uses 200ms. See http://www.postel.org/pipermail/end2end-interest/2004-November/004402.html
                    MakeTimeAccessor (&TcpSocketBase::SetMinRto,
                                      &TcpSocketBase::GetMinRto),
                                      MakeTimeChecker ())
@@ -141,6 +142,14 @@
                      "Remote side's flow control window",
                      MakeTraceSourceAccessor (&TcpSocketBase::m_rWnd),
                      "ns3::TracedValue::Uint32Callback")
+    .AddTraceSource ("HighestRxSequence",
+                     "Highest sequence number received from peer",
+                     MakeTraceSourceAccessor (&TcpSocketBase::m_highRxMark),
+                     "ns3::SequenceNumber32TracedValueCallback")
+    .AddTraceSource ("HighestRxAck",
+                     "Highest ack received from peer",
+                     MakeTraceSourceAccessor (&TcpSocketBase::m_highRxAckMark),
+                     "ns3::SequenceNumber32TracedValueCallback")
   ;
   return tid;
 }
@@ -168,6 +177,8 @@
     m_segmentSize (0),
     // For attribute initialization consistency (quiet valgrind)
     m_rWnd (0),
+    m_highRxMark (0),
+    m_highRxAckMark (0),
     m_sndScaleFactor (0),
     m_rcvScaleFactor (0),
     m_timestampEnabled (true),
@@ -208,6 +219,8 @@
     m_segmentSize (sock.m_segmentSize),
     m_maxWinSize (sock.m_maxWinSize),
     m_rWnd (sock.m_rWnd),
+    m_highRxMark (sock.m_highRxMark),
+    m_highRxAckMark (sock.m_highRxAckMark),
     m_winScalingEnabled (sock.m_winScalingEnabled),
     m_sndScaleFactor (sock.m_sndScaleFactor),
     m_rcvScaleFactor (sock.m_rcvScaleFactor),
@@ -600,7 +613,10 @@
       NS_LOG_LOGIC ("txBufSize=" << m_txBuffer->Size () << " state " << TcpStateName[m_state]);
       if (m_state == ESTABLISHED || m_state == CLOSE_WAIT)
         { // Try to send the data out
-          SendPendingData (m_connected);
+          if (!m_sendPendingDataEvent.IsRunning ())
+            {
+              m_sendPendingDataEvent = Simulator::Schedule ( TimeStep (1), &TcpSocketBase::SendPendingData, this, m_connected);
+            }
         }
       return p->GetSize ();
     }
@@ -941,15 +957,6 @@
       EstimateRtt (tcpHeader);
     }
 
-  // Update Rx window size, i.e. the flow control window
-  if (m_rWnd.Get () == 0 && tcpHeader.GetWindowSize () != 0)
-    { // persist probes end
-      NS_LOG_LOGIC (this << " Leaving zerowindow persist state");
-      m_persistEvent.Cancel ();
-    }
-  m_rWnd = tcpHeader.GetWindowSize ();
-  m_rWnd <<= m_rcvScaleFactor;
-
   // Discard fully out of range data packets
   if (packet->GetSize ()
       && OutOfRange (tcpHeader.GetSequenceNumber (), tcpHeader.GetSequenceNumber () + packet->GetSize ()))
@@ -967,6 +974,17 @@
       return;
     }
 
+  // Update Rx window size, i.e. the flow control window
+  if (m_rWnd.Get () == 0 && tcpHeader.GetWindowSize () != 0 && m_persistEvent.IsRunning ())
+    { // persist probes end
+      NS_LOG_LOGIC (this << " Leaving zerowindow persist state");
+      m_persistEvent.Cancel ();
+    }
+  if (tcpHeader.GetFlags () & TcpHeader::ACK)
+    {
+      UpdateWindowSize (tcpHeader);
+    }
+
   // TCP state machine code in different process functions
   // C.f.: tcp_rcv_state_process() in tcp_input.c in Linux kernel
   switch (m_state)
@@ -1045,15 +1063,6 @@
       EstimateRtt (tcpHeader);
     }
 
-  // Update Rx window size, i.e. the flow control window
-  if (m_rWnd.Get () == 0 && tcpHeader.GetWindowSize () != 0)
-    { // persist probes end
-      NS_LOG_LOGIC (this << " Leaving zerowindow persist state");
-      m_persistEvent.Cancel ();
-    }
-  m_rWnd = tcpHeader.GetWindowSize ();
-  m_rWnd <<= m_rcvScaleFactor;
-
   // Discard fully out of range packets
   if (packet->GetSize ()
       && OutOfRange (tcpHeader.GetSequenceNumber (), tcpHeader.GetSequenceNumber () + packet->GetSize ()))
@@ -1071,6 +1080,18 @@
       return;
     }
 
+  // Update Rx window size, i.e. the flow control window
+  if (m_rWnd.Get () == 0 && tcpHeader.GetWindowSize () != 0 && m_persistEvent.IsRunning ())
+    { // persist probes end
+      NS_LOG_LOGIC (this << " Leaving zerowindow persist state");
+      m_persistEvent.Cancel ();
+    }
+
+  if (tcpHeader.GetFlags () & TcpHeader::ACK)
+    {
+      UpdateWindowSize (tcpHeader);
+    }
+
   // TCP state machine code in different process functions
   // C.f.: tcp_rcv_state_process() in tcp_input.c in Linux kernel
   switch (m_state)
@@ -1712,7 +1733,7 @@
   header.SetWindowSize (AdvertisedWindowSize ());
 
   // RFC 6298, clause 2.4
-  m_rto = Max (m_rtt->GetEstimate () + Max (m_clockGranularity, m_rtt->GetVariation ()*4), Time::FromDouble (1,  Time::S));
+  m_rto = Max (m_rtt->GetEstimate () + Max (m_clockGranularity, m_rtt->GetVariation ()*4), m_minRto);
 
   bool hasSyn = flags & TcpHeader::SYN;
   bool hasFin = flags & TcpHeader::FIN;
@@ -2063,7 +2084,6 @@
   if (m_txBuffer->Size () == 0)
     {
       return false;                           // Nothing to send
-
     }
   if (m_endPoint == 0 && m_endPoint6 == 0)
     {
@@ -2074,17 +2094,10 @@
   while (m_txBuffer->SizeFromSequence (m_nextTxSequence))
     {
       uint32_t w = AvailableWindow (); // Get available window size
-      NS_LOG_LOGIC ("TcpSocketBase " << this << " SendPendingData" <<
-                    " w " << w <<
-                    " rxwin " << m_rWnd <<
-                    " segsize " << m_segmentSize <<
-                    " nextTxSeq " << m_nextTxSequence <<
-                    " highestRxAck " << m_txBuffer->HeadSequence () <<
-                    " pd->Size " << m_txBuffer->Size () <<
-                    " pd->SFS " << m_txBuffer->SizeFromSequence (m_nextTxSequence));
       // Stop sending if we need to wait for a larger Tx window (prevent silly window syndrome)
       if (w < m_segmentSize && m_txBuffer->SizeFromSequence (m_nextTxSequence) > w)
         {
+          NS_LOG_LOGIC ("Preventing Silly Window Syndrome. Wait to send.");
           break; // No more
         }
       // Nagle's algorithm (RFC896): Hold off sending if there is unacked data
@@ -2095,6 +2108,14 @@
           NS_LOG_LOGIC ("Invoking Nagle's algorithm. Wait to send.");
           break;
         }
+      NS_LOG_LOGIC ("TcpSocketBase " << this << " SendPendingData" <<
+                    " w " << w <<
+                    " rxwin " << m_rWnd <<
+                    " segsize " << m_segmentSize <<
+                    " nextTxSeq " << m_nextTxSequence <<
+                    " highestRxAck " << m_txBuffer->HeadSequence () <<
+                    " pd->Size " << m_txBuffer->Size () <<
+                    " pd->SFS " << m_txBuffer->SizeFromSequence (m_nextTxSequence));
       uint32_t s = std::min (w, m_segmentSize);  // Send no more than window
       uint32_t sz = SendDataPacket (m_nextTxSequence, s, withAck);
       nPacketsSent++;                             // Count sent this loop
@@ -2119,13 +2140,6 @@
 }
 
 uint32_t
-TcpSocketBase::Window ()
-{
-  NS_LOG_FUNCTION (this);
-  return m_rWnd;
-}
-
-uint32_t
 TcpSocketBase::AvailableWindow ()
 {
   NS_LOG_FUNCTION_NOARGS ();
@@ -2254,7 +2268,7 @@
     {
       m_rtt->Measurement (m);                // Log the measurement
       // RFC 6298, clause 2.4
-      m_rto = Max (m_rtt->GetEstimate () + Max (m_clockGranularity, m_rtt->GetVariation ()*4), Time::FromDouble (1,  Time::S));
+      m_rto = Max (m_rtt->GetEstimate () + Max (m_clockGranularity, m_rtt->GetVariation ()*4), m_minRto);
       m_lastRtt = m_rtt->GetEstimate ();
       NS_LOG_FUNCTION(this << m_lastRtt);
     }
@@ -2275,7 +2289,7 @@
       m_retxEvent.Cancel ();
       // On receiving a "New" ack we restart retransmission timer .. RFC 6298
       // RFC 6298, clause 2.4
-      m_rto = Max (m_rtt->GetEstimate () + Max (m_clockGranularity, m_rtt->GetVariation ()*4), Time::FromDouble (1,  Time::S));
+      m_rto = Max (m_rtt->GetEstimate () + Max (m_clockGranularity, m_rtt->GetVariation ()*4), m_minRto);
 
       NS_LOG_LOGIC (this << " Schedule ReTxTimeout at time " <<
                     Simulator::Now ().GetSeconds () << " to expire at time " <<
@@ -2313,7 +2327,10 @@
       m_retxEvent.Cancel ();
     }
   // Try to send more data
-  SendPendingData (m_connected);
+  if (!m_sendPendingDataEvent.IsRunning ())
+    {
+      m_sendPendingDataEvent = Simulator::Schedule ( TimeStep (1), &TcpSocketBase::SendPendingData, this, m_connected);
+    }
 }
 
 // Retransmit timeout
@@ -2450,6 +2467,7 @@
   m_delAckEvent.Cancel ();
   m_lastAckEvent.Cancel ();
   m_timewaitEvent.Cancel ();
+  m_sendPendingDataEvent.Cancel ();
 }
 
 /* Move TCP to Time_Wait state and schedule a transition to Closed state */
@@ -2604,6 +2622,7 @@
             {
               m_winScalingEnabled = true;
               ProcessOptionWScale (header.GetOption (TcpOption::WINSCALE));
+              ScaleSsThresh (m_sndScaleFactor);
             }
         }
     }
@@ -2726,6 +2745,50 @@
                option->GetTimestamp () << " echo=" << m_timestampToEcho);
 }
 
+void TcpSocketBase::UpdateWindowSize (const TcpHeader &header)
+{
+  NS_LOG_FUNCTION (this << header);
+  //  If the connection is not established, the window size is always
+  //  updated
+  uint32_t receivedWindow = header.GetWindowSize ();
+  receivedWindow <<= m_rcvScaleFactor;
+  NS_LOG_DEBUG ("Received (scaled) window is " << receivedWindow << " bytes");
+  if (m_state < ESTABLISHED)
+    {
+      m_rWnd = receivedWindow;
+      NS_LOG_DEBUG ("State less than ESTABLISHED; updating rWnd to " << m_rWnd);
+      return;
+    }
+
+  // Test for conditions that allow updating of the window
+  // 1) segment contains new data (advancing the right edge of the receive 
+  // buffer), 
+  // 2) segment does not contain new data but the segment acks new data 
+  // (highest sequence number acked advances), or
+  // 3) the advertised window is larger than the current send window
+  bool update = false;
+  if (header.GetAckNumber () == m_highRxAckMark && receivedWindow > m_rWnd)
+    {
+      // right edge of the send window is increased (window update)
+      update = true;
+    }
+  if (header.GetAckNumber () > m_highRxAckMark)
+    {
+      m_highRxAckMark = header.GetAckNumber ();
+      update = true;
+    }
+  if (header.GetSequenceNumber () > m_highRxMark)
+    {
+      m_highRxMark = header.GetSequenceNumber ();
+      update = true;
+    }
+  if (update == true)
+    {
+      m_rWnd = receivedWindow;
+      NS_LOG_DEBUG ("updating rWnd to " << m_rWnd);
+    }
+}
+
 void
 TcpSocketBase::SetMinRto (Time minRto)
 {
diff -Naur ns-3.22/src/internet/model/tcp-socket-base.h ns-3.23/src/internet/model/tcp-socket-base.h
--- ns-3.22/src/internet/model/tcp-socket-base.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-socket-base.h	2015-05-13 11:05:27.000000000 -0700
@@ -518,7 +518,7 @@
    * \brief Return the max possible number of unacked bytes
    * \returns the max possible number of unacked bytes
    */
-  virtual uint32_t Window (void);
+  virtual uint32_t Window (void) = 0;
 
   /**
    * \brief Return unfilled portion of window
@@ -532,6 +532,20 @@
    */
   virtual uint16_t AdvertisedWindowSize (void);
 
+  /**
+   * \brief Update the receiver window (RWND) based on the value of the 
+   * window field in the header.
+   *
+   * This method suppresses updates unless one of the following three 
+   * conditions holds:  1) segment contains new data (advancing the right
+   * edge of the receive buffer), 2) segment does not contain new data
+   * but the segment acks new data (highest sequence number acked advances),
+   * or 3) the advertised window is larger than the current send window
+   *
+   * \param header TcpHeader from which to extract the new window value
+   */
+  void UpdateWindowSize (const TcpHeader& header);
+
 
   // Manage data tx/rx
 
@@ -675,6 +689,15 @@
    */
   void AddOptionTimestamp (TcpHeader& header);
 
+  /**
+   * \brief Scale the initial SsThresh value to the correct one
+   *
+   * Set the initial SsThresh to the largest possible advertised window
+   * according to the sender scale factor.
+   *
+   * \param scaleFactor the sender scale factor
+   */
+  virtual void ScaleSsThresh (uint8_t scaleFactor) = 0;
 
 protected:
   // Counters and events
@@ -727,7 +750,9 @@
   // Window management
   uint32_t              m_segmentSize; //!< Segment size
   uint16_t              m_maxWinSize;  //!< Maximum window size to advertise
-  TracedValue<uint32_t> m_rWnd;        //!< Flow control window at remote side
+  TracedValue<uint32_t> m_rWnd;        //!< Receiver window (RCV.WND in RFC793)
+  TracedValue<SequenceNumber32> m_highRxMark;     //!< Highest seqno received
+  TracedValue<SequenceNumber32> m_highRxAckMark;  //!< Highest ack received
 
   // Options
   bool    m_winScalingEnabled;    //!< Window Scale option enabled
@@ -736,6 +761,8 @@
 
   bool     m_timestampEnabled;    //!< Timestamp option enabled
   uint32_t m_timestampToEcho;     //!< Timestamp to echo
+
+  EventId m_sendPendingDataEvent; //!< micro-delay event to send pending data
 };
 
 } // namespace ns3
diff -Naur ns-3.22/src/internet/model/tcp-socket.cc ns-3.23/src/internet/model/tcp-socket.cc
--- ns-3.22/src/internet/model/tcp-socket.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-socket.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpSocket")
     .SetParent<Socket> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("SndBufSize",
                    "TcpSocket maximum transmit buffer size (bytes)",
                    UintegerValue (131072), // 128k
diff -Naur ns-3.22/src/internet/model/tcp-socket-factory.cc ns-3.23/src/internet/model/tcp-socket-factory.cc
--- ns-3.22/src/internet/model/tcp-socket-factory.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-socket-factory.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpSocketFactory")
     .SetParent<SocketFactory> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/internet/model/tcp-tahoe.cc ns-3.23/src/internet/model/tcp-tahoe.cc
--- ns-3.22/src/internet/model/tcp-tahoe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-tahoe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpTahoe")
     .SetParent<TcpSocketBase> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpTahoe> ()
     .AddAttribute ("ReTxThreshold", "Threshold for fast retransmit",
                     UintegerValue (3),
@@ -214,4 +215,11 @@
   m_ssThresh = m_initialSsThresh;
 }
 
+void
+TcpTahoe::ScaleSsThresh (uint8_t scaleFactor)
+{
+  m_ssThresh <<= scaleFactor;
+}
+
+
 } // namespace ns3
diff -Naur ns-3.22/src/internet/model/tcp-tahoe.h ns-3.23/src/internet/model/tcp-tahoe.h
--- ns-3.22/src/internet/model/tcp-tahoe.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-tahoe.h	2015-05-13 11:05:27.000000000 -0700
@@ -75,6 +75,7 @@
   virtual uint32_t GetInitialSSThresh (void) const;
   virtual void     SetInitialCwnd (uint32_t cwnd);
   virtual uint32_t GetInitialCwnd (void) const;
+  virtual void ScaleSsThresh (uint8_t scaleFactor);
 private:
   /**
    * \brief Set the congestion window when connection starts
diff -Naur ns-3.22/src/internet/model/tcp-tx-buffer.cc ns-3.23/src/internet/model/tcp-tx-buffer.cc
--- ns-3.22/src/internet/model/tcp-tx-buffer.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-tx-buffer.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::TcpTxBuffer")
     .SetParent<Object> ()
+    .SetGroupName ("Internet")
     .AddConstructor<TcpTxBuffer> ()
     .AddTraceSource ("UnackSequence",
                      "First unacknowledged sequence number (SND.UNA)",
diff -Naur ns-3.22/src/internet/model/tcp-westwood.cc ns-3.23/src/internet/model/tcp-westwood.cc
--- ns-3.22/src/internet/model/tcp-westwood.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-westwood.cc	2015-05-13 11:05:27.000000000 -0700
@@ -53,6 +53,7 @@
 {
   static TypeId tid = TypeId("ns3::TcpWestwood")
       .SetParent<TcpSocketBase>()
+      .SetGroupName ("Internet")
       .AddConstructor<TcpWestwood>()
       .AddTraceSource("CongestionWindow", "The TCP connection's congestion window",
                       MakeTraceSourceAccessor(&TcpWestwood::m_cWnd),
@@ -292,7 +293,10 @@
     {// Increase cwnd for every additional DUPACK as in Reno
       m_cWnd += m_segmentSize;
       NS_LOG_INFO ("Dupack in fast recovery mode. Increase cwnd to " << m_cWnd);
-      SendPendingData (m_connected);
+      if (!m_sendPendingDataEvent.IsRunning ())
+        {
+          SendPendingData (m_connected);
+        }
     }
 }
 
@@ -425,4 +429,11 @@
   m_ssThresh = m_initialSsThresh;
 }
 
+void
+TcpWestwood::ScaleSsThresh (uint8_t scaleFactor)
+{
+  m_ssThresh <<= scaleFactor;
+}
+
+
 } // namespace ns3
diff -Naur ns-3.22/src/internet/model/tcp-westwood.h ns-3.23/src/internet/model/tcp-westwood.h
--- ns-3.22/src/internet/model/tcp-westwood.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/tcp-westwood.h	2015-05-13 11:05:27.000000000 -0700
@@ -126,6 +126,7 @@
   virtual uint32_t GetInitialSSThresh (void) const;
   virtual void     SetInitialCwnd (uint32_t cwnd);
   virtual uint32_t GetInitialCwnd (void) const;
+  virtual void ScaleSsThresh (uint8_t scaleFactor);
 
 private:
   /**
diff -Naur ns-3.22/src/internet/model/udp-header.cc ns-3.23/src/internet/model/udp-header.cc
--- ns-3.22/src/internet/model/udp-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/udp-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -155,6 +155,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Internet")
     .AddConstructor<UdpHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/internet/model/udp-l4-protocol.cc ns-3.23/src/internet/model/udp-l4-protocol.cc
--- ns-3.22/src/internet/model/udp-l4-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/udp-l4-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -54,6 +54,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpL4Protocol")
     .SetParent<IpL4Protocol> ()
+    .SetGroupName ("Internet")
     .AddConstructor<UdpL4Protocol> ()
     .AddAttribute ("SocketList", "The list of sockets associated to this protocol.",
                    ObjectVectorValue (),
diff -Naur ns-3.22/src/internet/model/udp-socket.cc ns-3.23/src/internet/model/udp-socket.cc
--- ns-3.22/src/internet/model/udp-socket.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/udp-socket.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpSocket")
     .SetParent<Socket> ()
+    .SetGroupName ("Internet")
     .AddAttribute ("RcvBufSize",
                    "UdpSocket maximum receive buffer size (bytes)",
                    UintegerValue (131072),
diff -Naur ns-3.22/src/internet/model/udp-socket-factory.cc ns-3.23/src/internet/model/udp-socket-factory.cc
--- ns-3.22/src/internet/model/udp-socket-factory.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/udp-socket-factory.cc	2015-05-13 11:05:27.000000000 -0700
@@ -28,6 +28,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpSocketFactory")
     .SetParent<SocketFactory> ()
+    .SetGroupName ("Internet")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/internet/model/udp-socket-impl.cc ns-3.23/src/internet/model/udp-socket-impl.cc
--- ns-3.22/src/internet/model/udp-socket-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/model/udp-socket-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -56,6 +56,7 @@
 {
   static TypeId tid = TypeId ("ns3::UdpSocketImpl")
     .SetParent<UdpSocket> ()
+    .SetGroupName ("Internet")
     .AddConstructor<UdpSocketImpl> ()
     .AddTraceSource ("Drop",
                      "Drop UDP packet due to receive buffer overflow",
diff -Naur ns-3.22/src/internet/test/codel-queue-test-suite.cc ns-3.23/src/internet/test/codel-queue-test-suite.cc
--- ns-3.22/src/internet/test/codel-queue-test-suite.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/test/codel-queue-test-suite.cc	2015-05-13 11:05:27.000000000 -0700
@@ -61,6 +61,21 @@
 public:
   CoDelQueueBasicEnqueueDequeue (std::string mode);
   virtual void DoRun (void);
+
+  void QueueTestSize (Ptr<CoDelQueue> queue, uint32_t size, std::string error)
+  {
+    if (queue->GetMode () == CoDelQueue::QUEUE_MODE_BYTES)
+      {
+        NS_TEST_EXPECT_MSG_EQ (queue->GetNBytes (), size, error);
+      }
+    else if (queue->GetMode () == CoDelQueue::QUEUE_MODE_PACKETS)
+      {
+        NS_TEST_EXPECT_MSG_EQ (queue->GetNPackets (), size, error);
+      }
+
+    NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), size, error);
+  }
+
 private:
   StringValue m_mode;
 };
@@ -109,19 +124,19 @@
   p5 = Create<Packet> (pktSize);
   p6 = Create<Packet> (pktSize);
 
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 0 * modeSize, "There should be no packets in queue");
+  QueueTestSize (queue, 0 * modeSize, "There should be no packets in queue");
   queue->Enqueue (p1);
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 1 * modeSize, "There should be one packet in queue");
+  QueueTestSize (queue, 1 * modeSize, "There should be one packet in queue");
   queue->Enqueue (p2);
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 2 * modeSize, "There should be two packets in queue");
+  QueueTestSize (queue, 2 * modeSize, "There should be two packets in queue");
   queue->Enqueue (p3);
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 3 * modeSize, "There should be three packets in queue");
+  QueueTestSize (queue, 3 * modeSize, "There should be three packets in queue");
   queue->Enqueue (p4);
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 4 * modeSize, "There should be four packets in queue");
+  QueueTestSize (queue, 4 * modeSize, "There should be four packets in queue");
   queue->Enqueue (p5);
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 5 * modeSize, "There should be five packets in queue");
+  QueueTestSize (queue, 5 * modeSize, "There should be five packets in queue");
   queue->Enqueue (p6);
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 6 * modeSize, "There should be six packets in queue");
+  QueueTestSize (queue, 6 * modeSize, "There should be six packets in queue");
 
   NS_TEST_EXPECT_MSG_EQ (queue->GetDropOverLimit (), 0, "There should be no packets being dropped due to full queue");
 
@@ -129,32 +144,32 @@
 
   p = queue->Dequeue ();
   NS_TEST_EXPECT_MSG_EQ ((p != 0), true, "I want to remove the first packet");
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 5 * modeSize, "There should be five packets in queue");
+  QueueTestSize (queue, 5 * modeSize, "There should be five packets in queue");
   NS_TEST_EXPECT_MSG_EQ (p->GetUid (), p1->GetUid (), "was this the first packet ?");
 
   p = queue->Dequeue ();
   NS_TEST_EXPECT_MSG_EQ ((p != 0), true, "I want to remove the second packet");
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 4 * modeSize, "There should be four packets in queue");
+  QueueTestSize (queue, 4 * modeSize, "There should be four packets in queue");
   NS_TEST_EXPECT_MSG_EQ (p->GetUid (), p2->GetUid (), "Was this the second packet ?");
 
   p = queue->Dequeue ();
   NS_TEST_EXPECT_MSG_EQ ((p != 0), true, "I want to remove the third packet");
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 3 * modeSize, "There should be three packets in queue");
+  QueueTestSize (queue, 3 * modeSize, "There should be three packets in queue");
   NS_TEST_EXPECT_MSG_EQ (p->GetUid (), p3->GetUid (), "Was this the third packet ?");
 
   p = queue->Dequeue ();
   NS_TEST_EXPECT_MSG_EQ ((p != 0), true, "I want to remove the forth packet");
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 2 * modeSize, "There should be two packets in queue");
+  QueueTestSize (queue, 2 * modeSize, "There should be two packets in queue");
   NS_TEST_EXPECT_MSG_EQ (p->GetUid (), p4->GetUid (), "Was this the fourth packet ?");
 
   p = queue->Dequeue ();
   NS_TEST_EXPECT_MSG_EQ ((p != 0), true, "I want to remove the fifth packet");
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 1 * modeSize, "There should be one packet in queue");
+  QueueTestSize (queue, 1 * modeSize, "There should be one packet in queue");
   NS_TEST_EXPECT_MSG_EQ (p->GetUid (), p5->GetUid (), "Was this the fifth packet ?");
 
   p = queue->Dequeue ();
   NS_TEST_EXPECT_MSG_EQ ((p != 0), true, "I want to remove the last packet");
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 0 * modeSize, "There should be zero packet in queue");
+  QueueTestSize (queue, 0 * modeSize, "There should be zero packet in queue");
   NS_TEST_EXPECT_MSG_EQ (p->GetUid (), p6->GetUid (), "Was this the sixth packet ?");
 
   p = queue->Dequeue ();
@@ -169,6 +184,21 @@
 public:
   CoDelQueueBasicOverflow (std::string mode);
   virtual void DoRun (void);
+
+  void QueueTestSize (Ptr<CoDelQueue> queue, uint32_t size, std::string error)
+  {
+    if (queue->GetMode () == CoDelQueue::QUEUE_MODE_BYTES)
+      {
+        NS_TEST_EXPECT_MSG_EQ (queue->GetNBytes (), size, error);
+      }
+    else if (queue->GetMode () == CoDelQueue::QUEUE_MODE_PACKETS)
+      {
+        NS_TEST_EXPECT_MSG_EQ (queue->GetNPackets (), size, error);
+      }
+
+    NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), size, error);
+  }
+
 private:
   void Enqueue (Ptr<CoDelQueue> queue, uint32_t size, uint32_t nPkt);
   StringValue m_mode;
@@ -216,7 +246,7 @@
   queue->Enqueue (p2);
   queue->Enqueue (p3);
 
-  NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), 500 * modeSize, "There should be 500 packets in queue");
+  QueueTestSize (queue, 500 * modeSize, "There should be 500 packets in queue");
   NS_TEST_EXPECT_MSG_EQ (queue->GetDropOverLimit (), 3, "There should be three packets being dropped due to full queue");
 }
 
@@ -321,6 +351,21 @@
 public:
   CoDelQueueBasicDrop (std::string mode);
   virtual void DoRun (void);
+
+  void QueueTestSize (Ptr<CoDelQueue> queue, uint32_t size, std::string error)
+  {
+    if (queue->GetMode () == CoDelQueue::QUEUE_MODE_BYTES)
+      {
+        NS_TEST_EXPECT_MSG_EQ (queue->GetNBytes (), size, error);
+      }
+    else if (queue->GetMode () == CoDelQueue::QUEUE_MODE_PACKETS)
+      {
+        NS_TEST_EXPECT_MSG_EQ (queue->GetNPackets (), size, error);
+      }
+
+    NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), size, error);
+  }
+
 private:
   void Enqueue (Ptr<CoDelQueue> queue, uint32_t size, uint32_t nPkt);
   void Dequeue (Ptr<CoDelQueue> queue, uint32_t modeSize);
@@ -419,13 +464,13 @@
               NS_TEST_EXPECT_MSG_EQ (currentDropCount, 0, "We are not in dropping state."
                                      "Sojourn time has just gone above target from below."
                                      "Hence, there should be no packet drops");
-              NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), initialQSize - modeSize, "There should be 1 packet dequeued.");
+              QueueTestSize (queue, initialQSize - modeSize, "There should be 1 packet dequeued.");
 
             }
           else if (currentTime >= queue->GetInterval ())
             {
               currentDropCount = queue->GetDropCount ();
-              NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), initialQSize - 2 * modeSize, "Sojourn time has been above target for at least interval."
+              QueueTestSize (queue, initialQSize - 2 * modeSize, "Sojourn time has been above target for at least interval."
                                      "We enter the dropping state, perform initial packet drop, and dequeue the next."
                                      "So there should be 2 more packets dequeued.");
               NS_TEST_EXPECT_MSG_EQ (currentDropCount, 1, "There should be 1 packet drop");
@@ -436,7 +481,7 @@
           if (currentTime.GetMicroSeconds () < initialDropNext)
             {
               currentDropCount = queue->GetDropCount ();
-              NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), initialQSize - modeSize, "We are in dropping state."
+              QueueTestSize (queue, initialQSize - modeSize, "We are in dropping state."
                                      "Sojourn is still above target."
                                      "However, it's not time for next drop."
                                      "So there should be only 1 more packet dequeued");
@@ -446,7 +491,7 @@
           else if (currentTime.GetMicroSeconds () >= initialDropNext)
             {
               currentDropCount = queue->GetDropCount ();
-              NS_TEST_EXPECT_MSG_EQ (queue->GetQueueSize (), initialQSize - (m_dropNextCount + 1) * modeSize, "We are in dropping state."
+              QueueTestSize (queue, initialQSize - (m_dropNextCount + 1) * modeSize, "We are in dropping state."
                                      "It's time for next drop."
                                      "The number of packets dequeued equals to the number of times m_dropNext is updated plus initial dequeue");
               NS_TEST_EXPECT_MSG_EQ (currentDropCount, 1 + m_dropNextCount, "The number of drops equals to the number of times m_dropNext is updated plus 1 from last dequeue");
diff -Naur ns-3.22/src/internet/test/tcp-header-test.cc ns-3.23/src/internet/test/tcp-header-test.cc
--- ns-3.22/src/internet/test/tcp-header-test.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/test/tcp-header-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -27,97 +27,106 @@
 
 namespace ns3 {
 
+#define GET_RANDOM_UINT32(RandomVariable) \
+  static_cast<uint32_t> (RandomVariable->GetInteger (0, UINT32_MAX))
+
+#define GET_RANDOM_UINT16(RandomVariable) \
+  static_cast<uint16_t> (RandomVariable->GetInteger (0, UINT16_MAX))
+
+#define GET_RANDOM_UINT8(RandomVariable) \
+  static_cast<uint8_t> (RandomVariable->GetInteger (0, UINT8_MAX))
+
+#define GET_RANDOM_UINT6(RandomVariable) \
+  static_cast<uint8_t> (RandomVariable->GetInteger (0, UINT8_MAX >> 2))
+
 class TcpHeaderGetSetTestCase : public TestCase
 {
 public:
-  TcpHeaderGetSetTestCase (uint16_t sourcePort, uint16_t destinationPort,
-                           SequenceNumber32 sequenceNumber, SequenceNumber32 ackNumber,
-                           uint8_t flags, uint16_t m_windowSize, uint16_t m_urgentPointer,
-                           std::string name);
+  TcpHeaderGetSetTestCase (std::string name);
 protected:
-  uint16_t m_sourcePort;        //!< Source port
-  uint16_t m_destinationPort;   //!< Destination port
-  SequenceNumber32 m_sequenceNumber;  //!< Sequence number
-  SequenceNumber32 m_ackNumber;       //!< ACK number
-  uint8_t m_flags;              //!< Flags (really a uint6_t)
-  uint16_t m_windowSize;        //!< Window size
-  uint16_t m_urgentPointer;     //!< Urgent pointer
-
 private:
   virtual void DoRun (void);
   virtual void DoTeardown (void);
 
-  TcpHeader m_header;
-  Buffer m_buffer;
 };
 
-TcpHeaderGetSetTestCase::TcpHeaderGetSetTestCase (
-  uint16_t sourcePort, uint16_t destinationPort,
-  SequenceNumber32 sequenceNumber, SequenceNumber32 ackNumber,
-  uint8_t flags, uint16_t windowSize, uint16_t urgentPointer,
-  std::string name) : TestCase (name)
-{
-  m_sourcePort = sourcePort;
-  m_destinationPort = destinationPort;
-  m_sequenceNumber = sequenceNumber;
-  m_ackNumber = ackNumber;
-  m_flags = flags;
-  m_windowSize = windowSize;
-  m_urgentPointer = urgentPointer;
-
-  m_header.SetSourcePort (m_sourcePort);
-  m_header.SetDestinationPort (m_destinationPort);
-  m_header.SetSequenceNumber (m_sequenceNumber);
-  m_header.SetAckNumber (m_ackNumber);
-  m_header.SetFlags (m_flags);
-  m_header.SetWindowSize (m_windowSize);
-  m_header.SetUrgentPointer (m_urgentPointer);
+TcpHeaderGetSetTestCase::TcpHeaderGetSetTestCase (std::string name) : TestCase (name)
+{
+}
+void TcpHeaderGetSetTestCase::DoRun (void)
+{
+  uint16_t sourcePort;        //!< Source port
+  uint16_t destinationPort;   //!< Destination port
+  SequenceNumber32 sequenceNumber;  //!< Sequence number
+  SequenceNumber32 ackNumber;       //!< ACK number
+  uint8_t flags;              //!< Flags (really a uint6_t)
+  uint16_t windowSize;        //!< Window size
+  uint16_t urgentPointer;     //!< Urgent pointer
+  TcpHeader header;
+  Buffer buffer;
+
+  Ptr<UniformRandomVariable> x = CreateObject<UniformRandomVariable> ();
+  for (uint32_t i = 0; i < 1000; ++i)
+    {
+      sourcePort = GET_RANDOM_UINT16 (x);
+      destinationPort = GET_RANDOM_UINT16 (x);
+      sequenceNumber = SequenceNumber32 (GET_RANDOM_UINT32 (x));
+      ackNumber = SequenceNumber32 (GET_RANDOM_UINT32 (x));
+      flags = GET_RANDOM_UINT6 (x);
+      windowSize = GET_RANDOM_UINT16 (x);
+      urgentPointer = GET_RANDOM_UINT16 (x);
+
+      header.SetSourcePort (sourcePort);
+      header.SetDestinationPort (destinationPort);
+      header.SetSequenceNumber (sequenceNumber);
+      header.SetAckNumber (ackNumber);
+      header.SetFlags (flags);
+      header.SetWindowSize (windowSize);
+      header.SetUrgentPointer (urgentPointer);
 
-  NS_TEST_ASSERT_MSG_EQ (m_header.GetLength (), 5, "TcpHeader without option is"
+      NS_TEST_ASSERT_MSG_EQ (header.GetLength (), 5, "TcpHeader without option is"
                          " not 5 word");
 
-  m_buffer.AddAtStart (m_header.GetSerializedSize ());
-  m_header.Serialize (m_buffer.Begin ());
-}
+      buffer.AddAtStart (header.GetSerializedSize ());
+      header.Serialize (buffer.Begin ());
 
-void TcpHeaderGetSetTestCase::DoRun (void)
-{
-  NS_TEST_ASSERT_MSG_EQ (m_sourcePort, m_header.GetSourcePort (),
+      NS_TEST_ASSERT_MSG_EQ (sourcePort, header.GetSourcePort (),
                          "Different source port found");
-  NS_TEST_ASSERT_MSG_EQ (m_destinationPort, m_header.GetDestinationPort (),
+      NS_TEST_ASSERT_MSG_EQ (destinationPort, header.GetDestinationPort (),
                          "Different destination port found");
-  NS_TEST_ASSERT_MSG_EQ (m_sequenceNumber, m_header.GetSequenceNumber (),
+      NS_TEST_ASSERT_MSG_EQ (sequenceNumber, header.GetSequenceNumber (),
                          "Different sequence number found");
-  NS_TEST_ASSERT_MSG_EQ (m_ackNumber, m_header.GetAckNumber (),
+      NS_TEST_ASSERT_MSG_EQ (ackNumber, header.GetAckNumber (),
                          "Different ack number found");
-  NS_TEST_ASSERT_MSG_EQ (m_flags, m_header.GetFlags (),
+      NS_TEST_ASSERT_MSG_EQ (flags, header.GetFlags (),
                          "Different flags found");
-  NS_TEST_ASSERT_MSG_EQ (m_windowSize, m_header.GetWindowSize (),
+      NS_TEST_ASSERT_MSG_EQ (windowSize, header.GetWindowSize (),
                          "Different window size found");
-  NS_TEST_ASSERT_MSG_EQ (m_urgentPointer, m_header.GetUrgentPointer (),
+      NS_TEST_ASSERT_MSG_EQ (urgentPointer, header.GetUrgentPointer (),
                          "Different urgent pointer found");
 
-  NS_TEST_ASSERT_MSG_EQ (m_header.GetLength (), 5, "TcpHeader without option is"
+      NS_TEST_ASSERT_MSG_EQ (header.GetLength (), 5, "TcpHeader without option is"
                          " not 5 word");
 
-  TcpHeader copyHeader;
+      TcpHeader copyHeader;
 
-  copyHeader.Deserialize (m_buffer.Begin ());
+      copyHeader.Deserialize (buffer.Begin ());
 
-  NS_TEST_ASSERT_MSG_EQ (m_sourcePort, copyHeader.GetSourcePort (),
+      NS_TEST_ASSERT_MSG_EQ (sourcePort, copyHeader.GetSourcePort (),
                          "Different source port found in deserialized header");
-  NS_TEST_ASSERT_MSG_EQ (m_destinationPort, copyHeader.GetDestinationPort (),
+      NS_TEST_ASSERT_MSG_EQ (destinationPort, copyHeader.GetDestinationPort (),
                          "Different destination port found in deserialized header");
-  NS_TEST_ASSERT_MSG_EQ (m_sequenceNumber, copyHeader.GetSequenceNumber (),
+      NS_TEST_ASSERT_MSG_EQ (sequenceNumber, copyHeader.GetSequenceNumber (),
                          "Different sequence number found in deserialized header");
-  NS_TEST_ASSERT_MSG_EQ (m_ackNumber, copyHeader.GetAckNumber (),
+      NS_TEST_ASSERT_MSG_EQ (ackNumber, copyHeader.GetAckNumber (),
                          "Different ack number found in deserialized header");
-  NS_TEST_ASSERT_MSG_EQ (m_flags, copyHeader.GetFlags (),
+      NS_TEST_ASSERT_MSG_EQ (flags, copyHeader.GetFlags (),
                          "Different flags found in deserialized header");
-  NS_TEST_ASSERT_MSG_EQ (m_windowSize, copyHeader.GetWindowSize (),
+      NS_TEST_ASSERT_MSG_EQ (windowSize, copyHeader.GetWindowSize (),
                          "Different window size found in deserialized header");
-  NS_TEST_ASSERT_MSG_EQ (m_urgentPointer, copyHeader.GetUrgentPointer (),
+      NS_TEST_ASSERT_MSG_EQ (urgentPointer, copyHeader.GetUrgentPointer (),
                          "Different urgent pointer found in deserialized header");
+    }
 }
 
 void TcpHeaderGetSetTestCase::DoTeardown (void)
@@ -313,17 +322,64 @@
 
 }
 
-#define GET_RANDOM_UINT32(RandomVariable) \
-  static_cast<uint32_t> (RandomVariable->GetInteger (0, UINT32_MAX))
+class TcpHeaderFlagsToString : public TestCase
+{
+public:
+  TcpHeaderFlagsToString (std::string name);
 
-#define GET_RANDOM_UINT16(RandomVariable) \
-  static_cast<uint16_t> (RandomVariable->GetInteger (0, UINT16_MAX))
+private:
+  virtual void DoRun (void);
+};
 
-#define GET_RANDOM_UINT8(RandomVariable) \
-  static_cast<uint8_t> (RandomVariable->GetInteger (0, UINT8_MAX))
+TcpHeaderFlagsToString::TcpHeaderFlagsToString (std::string name)
+  : TestCase (name)
+{
+}
 
-#define GET_RANDOM_UINT6(RandomVariable) \
-  static_cast<uint8_t> (RandomVariable->GetInteger (0, UINT8_MAX >> 2))
+void
+TcpHeaderFlagsToString::DoRun (void)
+{
+  std::string str, target;
+  str = TcpHeader::FlagsToString (0x0);
+  target = "";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x1);
+  target = "FIN";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x2);
+  target = "SYN";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x4);
+  target = "RST";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x8);
+  target = "PSH";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x10);
+  target = "ACK";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x20);
+  target = "URG";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x40);
+  target = "ECE";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x80);
+  target = "CWR";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x3);
+  target = "FIN|SYN";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0x5);
+  target = "FIN|RST";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0xff);
+  target = "FIN|SYN|RST|PSH|ACK|URG|ECE|CWR";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+  str = TcpHeader::FlagsToString (0xff, ":");
+  target = "FIN:SYN:RST:PSH:ACK:URG:ECE:CWR";
+  NS_TEST_ASSERT_MSG_EQ (str, target, "str " << str <<  " does not equal target " << target);
+}
 
 static class TcpHeaderTestSuite : public TestSuite
 {
@@ -331,26 +387,9 @@
   TcpHeaderTestSuite ()
     : TestSuite ("tcp-header", UNIT)
   {
-    Ptr<UniformRandomVariable> x = CreateObject<UniformRandomVariable> ();
-
-    for (uint32_t i = 0; i < 1000; ++i)
-      {
-        std::stringstream ss;
-        ss << i;
-
-        AddTestCase (new TcpHeaderGetSetTestCase (GET_RANDOM_UINT16 (x),
-                                                  GET_RANDOM_UINT16 (x),
-                                                  SequenceNumber32 (GET_RANDOM_UINT32 (x)),
-                                                  SequenceNumber32 (GET_RANDOM_UINT32 (x)),
-                                                  GET_RANDOM_UINT6 (x),
-                                                  GET_RANDOM_UINT16 (x),
-                                                  GET_RANDOM_UINT16 (x),
-                                                  "Case number " + ss.str ()),
-                     TestCase::QUICK);
-      }
-
-    AddTestCase (new TcpHeaderWithRFC793OptionTestCase ("Test for options in RFC 793"),
-                 TestCase::QUICK);
+    AddTestCase (new TcpHeaderGetSetTestCase ("GetSet test cases"), TestCase::QUICK);
+    AddTestCase (new TcpHeaderWithRFC793OptionTestCase ("Test for options in RFC 793"), TestCase::QUICK);
+    AddTestCase (new TcpHeaderFlagsToString ("Test flags to string function"), TestCase::QUICK);
   }
 
 } g_TcpHeaderTestSuite;
diff -Naur ns-3.22/src/internet/test/tcp-option-test.cc ns-3.23/src/internet/test/tcp-option-test.cc
--- ns-3.22/src/internet/test/tcp-option-test.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/internet/test/tcp-option-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -93,7 +93,7 @@
 class TcpOptionTSTestCase : public TestCase
 {
 public:
-  TcpOptionTSTestCase (std::string name, uint32_t timestamp, uint32_t echo);
+  TcpOptionTSTestCase (std::string name);
 
   void TestSerialize ();
   void TestDeserialize ();
@@ -108,19 +108,23 @@
 };
 
 
-TcpOptionTSTestCase::TcpOptionTSTestCase (std::string name, uint32_t timestamp,
-                                          uint32_t echo)
+TcpOptionTSTestCase::TcpOptionTSTestCase (std::string name)
   : TestCase (name)
 {
-  m_timestamp = timestamp;
-  m_echo = echo;
 }
 
 void
 TcpOptionTSTestCase::DoRun ()
 {
-  TestSerialize ();
-  TestDeserialize ();
+  Ptr<UniformRandomVariable> x = CreateObject<UniformRandomVariable> ();
+
+  for (uint32_t i = 0; i < 1000; ++i)
+    {
+      m_timestamp = x->GetInteger ();
+      m_echo = x->GetInteger ();
+      TestSerialize ();
+      TestDeserialize ();
+    }
 }
 
 void
@@ -171,17 +175,7 @@
         AddTestCase (new TcpOptionWSTestCase ("Testing window "
                                               "scale value", i), TestCase::QUICK);
       }
-
-    Ptr<UniformRandomVariable> x = CreateObject<UniformRandomVariable> ();
-
-    for (uint32_t i = 0; i < 1000; ++i)
-      {
-        AddTestCase (new TcpOptionTSTestCase ("Testing serialization of random "
-                                              "values for timestamp",
-                                              x->GetInteger (),
-                                              x->GetInteger ()), TestCase::QUICK);
-      }
-
+    AddTestCase (new TcpOptionTSTestCase ("Testing serialization of random values for timestamp"), TestCase::QUICK);
   }
 
 } g_TcpOptionTestSuite;
diff -Naur ns-3.22/src/lr-wpan/model/lr-wpan-csmaca.cc ns-3.23/src/lr-wpan/model/lr-wpan-csmaca.cc
--- ns-3.22/src/lr-wpan/model/lr-wpan-csmaca.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lr-wpan/model/lr-wpan-csmaca.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::LrWpanCsmaCa")
     .SetParent<Object> ()
+    .SetGroupName ("LrWpan")
     .AddConstructor<LrWpanCsmaCa> ()
   ;
   return tid;
@@ -239,7 +240,7 @@
 
 
   symbolRate = (uint64_t) m_mac->GetPhy ()->GetDataOrSymbolRate (isData); //symbols per second
-  backoffPeriod = (uint64_t)m_random->GetValue (0, upperBound); //num backoff periods
+  backoffPeriod = (uint64_t)m_random->GetValue (0, upperBound+1); // num backoff periods
   randomBackoff = MicroSeconds (backoffPeriod * GetUnitBackoffPeriod () * 1000 * 1000 / symbolRate);
 
   if (IsUnSlottedCsmaCa ())
diff -Naur ns-3.22/src/lr-wpan/model/lr-wpan-error-model.cc ns-3.23/src/lr-wpan/model/lr-wpan-error-model.cc
--- ns-3.22/src/lr-wpan/model/lr-wpan-error-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lr-wpan/model/lr-wpan-error-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::LrWpanErrorModel")
     .SetParent<Object> ()
+    .SetGroupName ("LrWpan")
     .AddConstructor<LrWpanErrorModel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lr-wpan/model/lr-wpan-lqi-tag.cc ns-3.23/src/lr-wpan/model/lr-wpan-lqi-tag.cc
--- ns-3.22/src/lr-wpan/model/lr-wpan-lqi-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lr-wpan/model/lr-wpan-lqi-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::LrWpanLqiTag")
     .SetParent<Tag> ()
+    .SetGroupName ("LrWpan")
     .AddConstructor<LrWpanLqiTag> ()
     .AddAttribute ("Lqi", "The lqi of the last packet received",
                    IntegerValue (0),
diff -Naur ns-3.22/src/lr-wpan/model/lr-wpan-mac.cc ns-3.23/src/lr-wpan/model/lr-wpan-mac.cc
--- ns-3.22/src/lr-wpan/model/lr-wpan-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lr-wpan/model/lr-wpan-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -51,6 +51,7 @@
 {
   static TypeId tid = TypeId ("ns3::LrWpanMac")
     .SetParent<Object> ()
+    .SetGroupName ("LrWpan")
     .AddConstructor<LrWpanMac> ()
     .AddAttribute ("PanId", "16-bit identifier of the associated PAN",
                    UintegerValue (),
diff -Naur ns-3.22/src/lr-wpan/model/lr-wpan-mac-header.cc ns-3.23/src/lr-wpan/model/lr-wpan-mac-header.cc
--- ns-3.22/src/lr-wpan/model/lr-wpan-mac-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lr-wpan/model/lr-wpan-mac-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -485,6 +485,7 @@
 {
   static TypeId tid = TypeId ("ns3::LrWpanMacHeader")
     .SetParent<Header> ()
+    .SetGroupName ("LrWpan")
     .AddConstructor<LrWpanMacHeader> ();
   return tid;
 }
diff -Naur ns-3.22/src/lr-wpan/model/lr-wpan-mac-trailer.cc ns-3.23/src/lr-wpan/model/lr-wpan-mac-trailer.cc
--- ns-3.22/src/lr-wpan/model/lr-wpan-mac-trailer.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lr-wpan/model/lr-wpan-mac-trailer.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::LrWpanMacTrailer")
     .SetParent<Trailer> ()
+    .SetGroupName ("LrWpan")
     .AddConstructor<LrWpanMacTrailer> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lr-wpan/model/lr-wpan-net-device.cc ns-3.23/src/lr-wpan/model/lr-wpan-net-device.cc
--- ns-3.22/src/lr-wpan/model/lr-wpan-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lr-wpan/model/lr-wpan-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::LrWpanNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("LrWpan")
     .AddConstructor<LrWpanNetDevice> ()
     .AddAttribute ("Channel", "The channel attached to this device",
                    PointerValue (),
diff -Naur ns-3.22/src/lr-wpan/model/lr-wpan-phy.cc ns-3.23/src/lr-wpan/model/lr-wpan-phy.cc
--- ns-3.22/src/lr-wpan/model/lr-wpan-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lr-wpan/model/lr-wpan-phy.cc	2015-05-13 11:05:27.000000000 -0700
@@ -75,6 +75,7 @@
 {
   static TypeId tid = TypeId ("ns3::LrWpanPhy")
     .SetParent<Object> ()
+    .SetGroupName ("LrWpan")
     .AddConstructor<LrWpanPhy> ()
     .AddTraceSource ("TrxState",
                      "The state of the transceiver",
@@ -284,7 +285,7 @@
 
   Ptr<LrWpanSpectrumSignalParameters> lrWpanRxParams = DynamicCast<LrWpanSpectrumSignalParameters> (spectrumRxParams);
 
-  if ( lrWpanRxParams == 0)
+  if (lrWpanRxParams == 0)
     {
       CheckInterference ();
       m_signal->AddSignal (spectrumRxParams->psd);
@@ -449,7 +450,11 @@
       m_edPower.lastUpdate = now;
     }
 
-  CheckInterference ();
+  Ptr<LrWpanSpectrumSignalParameters> currentRxParams = m_currentRxPacket.first;
+  if (currentRxParams == params)
+    {
+      CheckInterference ();
+    }
 
   // Update the interference.
   m_signal->RemoveSignal (par->psd);
@@ -461,7 +466,6 @@
     }
 
   // If this is the end of the currently received packet, check if reception was successful.
-  Ptr<LrWpanSpectrumSignalParameters> currentRxParams = m_currentRxPacket.first;
   if (currentRxParams == params)
     {
       Ptr<Packet> currentPacket = currentRxParams->packetBurst->GetPackets ().front ();
@@ -898,7 +902,7 @@
           }
         if (m_phyPIBAttributes.phyCurrentChannel != attribute->phyCurrentChannel)
           {
-            // Cancel a pending tranceiver state change.
+            // Cancel a pending transceiver state change.
             // Switch off the transceiver.
             // TODO: Is switching off the transceiver the right choice?
             m_trxState = IEEE_802_15_4_PHY_TRX_OFF;
@@ -928,6 +932,8 @@
                   }
               }
             m_phyPIBAttributes.phyCurrentChannel = attribute->phyCurrentChannel;
+            LrWpanSpectrumValueHelper psdHelper;
+            m_txPsd = psdHelper.CreateTxPowerSpectralDensity (m_phyPIBAttributes.phyTransmitPower, m_phyPIBAttributes.phyCurrentChannel);
           }
         break;
       }
diff -Naur ns-3.22/src/lr-wpan/test/lr-wpan-collision-test.cc ns-3.23/src/lr-wpan/test/lr-wpan-collision-test.cc
--- ns-3.22/src/lr-wpan/test/lr-wpan-collision-test.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lr-wpan/test/lr-wpan-collision-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -189,7 +189,7 @@
   Simulator::Run ();
 
   std::cout << "m_rxPackets = " << int(m_rxPackets) << std::endl;
-  NS_TEST_EXPECT_MSG_EQ (m_rxPackets, 0, "Received a packet (as expected)");
+  NS_TEST_EXPECT_MSG_EQ (m_rxPackets, 1, "Received a packet (as expected)");
 
   // Fourth case: two concurrent tx and ACKs
   std::cout << "*** Fourth test " << std::endl;
diff -Naur ns-3.22/src/lte/bindings/callbacks_list.py ns-3.23/src/lte/bindings/callbacks_list.py
--- ns-3.22/src/lte/bindings/callbacks_list.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/bindings/callbacks_list.py	2015-05-13 11:05:27.000000000 -0700
@@ -1,5 +1,4 @@
 callback_classes = [
-    ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'unsigned short', 'ns3::Ptr<ns3::SpectrumValue>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
diff -Naur ns-3.22/src/lte/bindings/modulegen__gcc_ILP32.py ns-3.23/src/lte/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/lte/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -562,6 +562,8 @@
     module.add_class('ThresholdEutra', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ThresholdEutra [enumeration]
     module.add_enum('', ['THRESHOLD_RSRP', 'THRESHOLD_RSRQ'], outer_class=root_module['ns3::LteRrcSap::ThresholdEutra'])
+    ## lte-chunk-processor.h (module 'lte'): ns3::LteSpectrumValueCatcher [class]
+    module.add_class('LteSpectrumValueCatcher')
     ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper [class]
     module.add_class('LteSpectrumValueHelper')
     ## lte-ue-cmac-sap.h (module 'lte'): ns3::LteUeCmacSapProvider [class]
@@ -1119,7 +1121,7 @@
     ## lte-spectrum-phy.h (module 'lte'): ns3::LteSpectrumPhy [class]
     module.add_class('LteSpectrumPhy', parent=root_module['ns3::SpectrumPhy'])
     ## lte-spectrum-phy.h (module 'lte'): ns3::LteSpectrumPhy::State [enumeration]
-    module.add_enum('State', ['IDLE', 'TX', 'RX_DATA', 'RX_CTRL'], outer_class=root_module['ns3::LteSpectrumPhy'])
+    module.add_enum('State', ['IDLE', 'TX_DL_CTRL', 'TX_DATA', 'TX_UL_SRS', 'RX_DL_CTRL', 'RX_DATA', 'RX_UL_SRS'], outer_class=root_module['ns3::LteSpectrumPhy'])
     ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParameters [struct]
     module.add_class('LteSpectrumSignalParameters', parent=root_module['ns3::SpectrumSignalParameters'])
     ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParametersDataFrame [struct]
@@ -1790,6 +1792,7 @@
     register_Ns3LteRrcSapSystemInformationBlockType1_methods(root_module, root_module['ns3::LteRrcSap::SystemInformationBlockType1'])
     register_Ns3LteRrcSapSystemInformationBlockType2_methods(root_module, root_module['ns3::LteRrcSap::SystemInformationBlockType2'])
     register_Ns3LteRrcSapThresholdEutra_methods(root_module, root_module['ns3::LteRrcSap::ThresholdEutra'])
+    register_Ns3LteSpectrumValueCatcher_methods(root_module, root_module['ns3::LteSpectrumValueCatcher'])
     register_Ns3LteSpectrumValueHelper_methods(root_module, root_module['ns3::LteSpectrumValueHelper'])
     register_Ns3LteUeCmacSapProvider_methods(root_module, root_module['ns3::LteUeCmacSapProvider'])
     register_Ns3LteUeCmacSapProviderLogicalChannelConfig_methods(root_module, root_module['ns3::LteUeCmacSapProvider::LogicalChannelConfig'])
@@ -2822,11 +2825,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
@@ -6876,6 +6889,21 @@
     cls.add_instance_attribute('range', 'uint8_t', is_const=False)
     return
 
+def register_Ns3LteSpectrumValueCatcher_methods(root_module, cls):
+    ## lte-chunk-processor.h (module 'lte'): ns3::LteSpectrumValueCatcher::LteSpectrumValueCatcher() [constructor]
+    cls.add_constructor([])
+    ## lte-chunk-processor.h (module 'lte'): ns3::LteSpectrumValueCatcher::LteSpectrumValueCatcher(ns3::LteSpectrumValueCatcher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteSpectrumValueCatcher const &', 'arg0')])
+    ## lte-chunk-processor.h (module 'lte'): ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueCatcher::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'ns3::Ptr< ns3::SpectrumValue >', 
+                   [])
+    ## lte-chunk-processor.h (module 'lte'): void ns3::LteSpectrumValueCatcher::ReportValue(ns3::SpectrumValue const & value) [member function]
+    cls.add_method('ReportValue', 
+                   'void', 
+                   [param('ns3::SpectrumValue const &', 'value')])
+    return
+
 def register_Ns3LteSpectrumValueHelper_methods(root_module, cls):
     ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper::LteSpectrumValueHelper() [constructor]
     cls.add_constructor([])
@@ -9699,6 +9727,14 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## lte-rlc-am-header.h (module 'lte'): bool ns3::LteRlcAmHeader::IsNackPresent(ns3::SequenceNumber10 nack) [member function]
+    cls.add_method('IsNackPresent', 
+                   'bool', 
+                   [param('ns3::SequenceNumber10', 'nack')])
+    ## lte-rlc-am-header.h (module 'lte'): bool ns3::LteRlcAmHeader::OneMoreNackWouldFitIn(uint16_t bytes) [member function]
+    cls.add_method('OneMoreNackWouldFitIn', 
+                   'bool', 
+                   [param('uint16_t', 'bytes')])
     ## lte-rlc-am-header.h (module 'lte'): uint8_t ns3::LteRlcAmHeader::PopExtensionBit() [member function]
     cls.add_method('PopExtensionBit', 
                    'uint8_t', 
@@ -9707,6 +9743,10 @@
     cls.add_method('PopLengthIndicator', 
                    'uint16_t', 
                    [])
+    ## lte-rlc-am-header.h (module 'lte'): int ns3::LteRlcAmHeader::PopNack() [member function]
+    cls.add_method('PopNack', 
+                   'int', 
+                   [])
     ## lte-rlc-am-header.h (module 'lte'): void ns3::LteRlcAmHeader::Print(std::ostream & os) const [member function]
     cls.add_method('Print', 
                    'void', 
@@ -9720,6 +9760,10 @@
     cls.add_method('PushLengthIndicator', 
                    'void', 
                    [param('uint16_t', 'lengthIndicator')])
+    ## lte-rlc-am-header.h (module 'lte'): void ns3::LteRlcAmHeader::PushNack(int nack) [member function]
+    cls.add_method('PushNack', 
+                   'void', 
+                   [param('int', 'nack')])
     ## lte-rlc-am-header.h (module 'lte'): void ns3::LteRlcAmHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
     cls.add_method('Serialize', 
                    'void', 
@@ -16875,10 +16919,14 @@
     cls.add_method('StartRxData', 
                    'void', 
                    [param('ns3::Ptr< ns3::LteSpectrumSignalParametersDataFrame >', 'params')])
-    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::StartRxCtrl(ns3::Ptr<ns3::SpectrumSignalParameters> params) [member function]
-    cls.add_method('StartRxCtrl', 
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::StartRxDlCtrl(ns3::Ptr<ns3::LteSpectrumSignalParametersDlCtrlFrame> lteDlCtrlRxParams) [member function]
+    cls.add_method('StartRxDlCtrl', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::LteSpectrumSignalParametersDlCtrlFrame >', 'lteDlCtrlRxParams')])
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::StartRxUlSrs(ns3::Ptr<ns3::LteSpectrumSignalParametersUlSrsFrame> lteUlSrsRxParams) [member function]
+    cls.add_method('StartRxUlSrs', 
                    'void', 
-                   [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')])
+                   [param('ns3::Ptr< ns3::LteSpectrumSignalParametersUlSrsFrame >', 'lteUlSrsRxParams')])
     ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::SetHarqPhyModule(ns3::Ptr<ns3::LteHarqPhy> harq) [member function]
     cls.add_method('SetHarqPhyModule', 
                    'void', 
diff -Naur ns-3.22/src/lte/bindings/modulegen__gcc_LP64.py ns-3.23/src/lte/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/lte/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -562,6 +562,8 @@
     module.add_class('ThresholdEutra', outer_class=root_module['ns3::LteRrcSap'])
     ## lte-rrc-sap.h (module 'lte'): ns3::LteRrcSap::ThresholdEutra [enumeration]
     module.add_enum('', ['THRESHOLD_RSRP', 'THRESHOLD_RSRQ'], outer_class=root_module['ns3::LteRrcSap::ThresholdEutra'])
+    ## lte-chunk-processor.h (module 'lte'): ns3::LteSpectrumValueCatcher [class]
+    module.add_class('LteSpectrumValueCatcher')
     ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper [class]
     module.add_class('LteSpectrumValueHelper')
     ## lte-ue-cmac-sap.h (module 'lte'): ns3::LteUeCmacSapProvider [class]
@@ -1119,7 +1121,7 @@
     ## lte-spectrum-phy.h (module 'lte'): ns3::LteSpectrumPhy [class]
     module.add_class('LteSpectrumPhy', parent=root_module['ns3::SpectrumPhy'])
     ## lte-spectrum-phy.h (module 'lte'): ns3::LteSpectrumPhy::State [enumeration]
-    module.add_enum('State', ['IDLE', 'TX', 'RX_DATA', 'RX_CTRL'], outer_class=root_module['ns3::LteSpectrumPhy'])
+    module.add_enum('State', ['IDLE', 'TX_DL_CTRL', 'TX_DATA', 'TX_UL_SRS', 'RX_DL_CTRL', 'RX_DATA', 'RX_UL_SRS'], outer_class=root_module['ns3::LteSpectrumPhy'])
     ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParameters [struct]
     module.add_class('LteSpectrumSignalParameters', parent=root_module['ns3::SpectrumSignalParameters'])
     ## lte-spectrum-signal-parameters.h (module 'lte'): ns3::LteSpectrumSignalParametersDataFrame [struct]
@@ -1790,6 +1792,7 @@
     register_Ns3LteRrcSapSystemInformationBlockType1_methods(root_module, root_module['ns3::LteRrcSap::SystemInformationBlockType1'])
     register_Ns3LteRrcSapSystemInformationBlockType2_methods(root_module, root_module['ns3::LteRrcSap::SystemInformationBlockType2'])
     register_Ns3LteRrcSapThresholdEutra_methods(root_module, root_module['ns3::LteRrcSap::ThresholdEutra'])
+    register_Ns3LteSpectrumValueCatcher_methods(root_module, root_module['ns3::LteSpectrumValueCatcher'])
     register_Ns3LteSpectrumValueHelper_methods(root_module, root_module['ns3::LteSpectrumValueHelper'])
     register_Ns3LteUeCmacSapProvider_methods(root_module, root_module['ns3::LteUeCmacSapProvider'])
     register_Ns3LteUeCmacSapProviderLogicalChannelConfig_methods(root_module, root_module['ns3::LteUeCmacSapProvider::LogicalChannelConfig'])
@@ -2822,11 +2825,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
@@ -6876,6 +6889,21 @@
     cls.add_instance_attribute('range', 'uint8_t', is_const=False)
     return
 
+def register_Ns3LteSpectrumValueCatcher_methods(root_module, cls):
+    ## lte-chunk-processor.h (module 'lte'): ns3::LteSpectrumValueCatcher::LteSpectrumValueCatcher() [constructor]
+    cls.add_constructor([])
+    ## lte-chunk-processor.h (module 'lte'): ns3::LteSpectrumValueCatcher::LteSpectrumValueCatcher(ns3::LteSpectrumValueCatcher const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::LteSpectrumValueCatcher const &', 'arg0')])
+    ## lte-chunk-processor.h (module 'lte'): ns3::Ptr<ns3::SpectrumValue> ns3::LteSpectrumValueCatcher::GetValue() [member function]
+    cls.add_method('GetValue', 
+                   'ns3::Ptr< ns3::SpectrumValue >', 
+                   [])
+    ## lte-chunk-processor.h (module 'lte'): void ns3::LteSpectrumValueCatcher::ReportValue(ns3::SpectrumValue const & value) [member function]
+    cls.add_method('ReportValue', 
+                   'void', 
+                   [param('ns3::SpectrumValue const &', 'value')])
+    return
+
 def register_Ns3LteSpectrumValueHelper_methods(root_module, cls):
     ## lte-spectrum-value-helper.h (module 'lte'): ns3::LteSpectrumValueHelper::LteSpectrumValueHelper() [constructor]
     cls.add_constructor([])
@@ -9699,6 +9727,14 @@
                    'bool', 
                    [], 
                    is_const=True)
+    ## lte-rlc-am-header.h (module 'lte'): bool ns3::LteRlcAmHeader::IsNackPresent(ns3::SequenceNumber10 nack) [member function]
+    cls.add_method('IsNackPresent', 
+                   'bool', 
+                   [param('ns3::SequenceNumber10', 'nack')])
+    ## lte-rlc-am-header.h (module 'lte'): bool ns3::LteRlcAmHeader::OneMoreNackWouldFitIn(uint16_t bytes) [member function]
+    cls.add_method('OneMoreNackWouldFitIn', 
+                   'bool', 
+                   [param('uint16_t', 'bytes')])
     ## lte-rlc-am-header.h (module 'lte'): uint8_t ns3::LteRlcAmHeader::PopExtensionBit() [member function]
     cls.add_method('PopExtensionBit', 
                    'uint8_t', 
@@ -9707,6 +9743,10 @@
     cls.add_method('PopLengthIndicator', 
                    'uint16_t', 
                    [])
+    ## lte-rlc-am-header.h (module 'lte'): int ns3::LteRlcAmHeader::PopNack() [member function]
+    cls.add_method('PopNack', 
+                   'int', 
+                   [])
     ## lte-rlc-am-header.h (module 'lte'): void ns3::LteRlcAmHeader::Print(std::ostream & os) const [member function]
     cls.add_method('Print', 
                    'void', 
@@ -9720,6 +9760,10 @@
     cls.add_method('PushLengthIndicator', 
                    'void', 
                    [param('uint16_t', 'lengthIndicator')])
+    ## lte-rlc-am-header.h (module 'lte'): void ns3::LteRlcAmHeader::PushNack(int nack) [member function]
+    cls.add_method('PushNack', 
+                   'void', 
+                   [param('int', 'nack')])
     ## lte-rlc-am-header.h (module 'lte'): void ns3::LteRlcAmHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
     cls.add_method('Serialize', 
                    'void', 
@@ -16875,10 +16919,14 @@
     cls.add_method('StartRxData', 
                    'void', 
                    [param('ns3::Ptr< ns3::LteSpectrumSignalParametersDataFrame >', 'params')])
-    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::StartRxCtrl(ns3::Ptr<ns3::SpectrumSignalParameters> params) [member function]
-    cls.add_method('StartRxCtrl', 
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::StartRxDlCtrl(ns3::Ptr<ns3::LteSpectrumSignalParametersDlCtrlFrame> lteDlCtrlRxParams) [member function]
+    cls.add_method('StartRxDlCtrl', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::LteSpectrumSignalParametersDlCtrlFrame >', 'lteDlCtrlRxParams')])
+    ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::StartRxUlSrs(ns3::Ptr<ns3::LteSpectrumSignalParametersUlSrsFrame> lteUlSrsRxParams) [member function]
+    cls.add_method('StartRxUlSrs', 
                    'void', 
-                   [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')])
+                   [param('ns3::Ptr< ns3::LteSpectrumSignalParametersUlSrsFrame >', 'lteUlSrsRxParams')])
     ## lte-spectrum-phy.h (module 'lte'): void ns3::LteSpectrumPhy::SetHarqPhyModule(ns3::Ptr<ns3::LteHarqPhy> harq) [member function]
     cls.add_method('SetHarqPhyModule', 
                    'void', 
diff -Naur ns-3.22/src/lte/doc/source/lte-design.rst ns-3.23/src/lte/doc/source/lte-design.rst
--- ns-3.22/src/lte/doc/source/lte-design.rst	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/doc/source/lte-design.rst	2015-05-13 11:05:27.000000000 -0700
@@ -503,7 +503,7 @@
 of periodic wideband CQI (i.e., a single value of channel state that is deemed representative of all RBs
 in use) and inband CQIs (i.e., a set of value representing the channel state for each RB).
 
-The CQI index to be reported is obtained by first obtaining a SINR measurement and then passing this SINR measurement  the :ref:`Adaptive Modulation and Coding` which will map it to the CQI index. 
+The CQI index to be reported is obtained by first obtaining a SINR measurement and then passing this SINR measurement to the `Adaptive Modulation and Coding`_ module which will map it to the CQI index. 
 
 In downlink, the SINR used to generate CQI feedback can be calculated in two different ways:
 
diff -Naur ns-3.22/src/lte/doc/source/lte-testing.rst ns-3.23/src/lte/doc/source/lte-testing.rst
--- ns-3.22/src/lte/doc/source/lte-testing.rst	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/doc/source/lte-testing.rst	2015-05-13 11:05:27.000000000 -0700
@@ -113,12 +113,6 @@
 each element in the test vector.
 
 
-
-
-
-
-
-
 System Tests
 ~~~~~~~~~~~~
 
@@ -130,25 +124,26 @@
 Attach UE -> Create Default+Dedicated Bearer -> Deactivate one of the Dedicated bearer
 
 Test case further deactivates dedicated bearer having bearer ID 2(LCID=BearerId+2) of First UE (UE_ID=1) 
-User can schedule bearer deactivation after specific time delay using Simulator::Schedule () method.
+User can schedule bearer deactivation after specific time delay using Simulator::Schedule () method. 
+
+Once the test case execution ends it will create ``DlRlcStats.txt`` and ``UlRlcStats.txt``. Key fields that need to be checked in statistics are:
 
-Once the test case execution ends it will create DlRlcStats.txt and UlRlcStats.txt. 
-Key fields that need to be checked in statistics are:
-|Start | end | Cell ID | IMSI | RNTI | LCID | TxBytes | RxBytes |
-
-Test case executes in three epoch’s.
-1) In first Epoch (0.04s-1.04s) All UE’s and corresponding bearers gets attached 
-   and packet flow over the dedicated bearers activated.
-2) In second Epoch (1.04s-2.04s), bearer deactivation is instantiated, hence User can see 
-   relatively less number of TxBytes on UE_ID=1 and LCID=4 as compared to other bearers.
-3) In third Epoch (2.04s-3.04s) since bearer deactivation of UE_ID=1 and LCID=4 is completed, 
-   user will not see any logging related to LCID=4.
+:: 
+
+  |Start | end | Cell ID | IMSI | RNTI | LCID | TxBytes | RxBytes |
+
+Test case executes in three epochs:
+
+ #. In first Epoch (0.04s-1.04s) All UE’s and corresponding bearers gets attached and packet flow over the dedicated bearers activated.
+ #. In second Epoch (1.04s-2.04s), bearer deactivation is instantiated, hence User can see relatively less number of TxBytes on UE_ID=1 and LCID=4 as compared to other bearers.
+ #. In third Epoch (2.04s-3.04s) since bearer deactivation of UE_ID=1 and LCID=4 is completed, user will not see any logging related to LCID=4.
 
 Test case passes if and only if 
-1) IMSI=1 and LCID=4 completely removed in third epoch 
-2) No packets seen in TxBytes and RxBytes corresponding to IMSI=1 and LCID=4
-If above criterion does not match test case considered to be failed
 
+ #. IMSI=1 and LCID=4 completely removed in third epoch 
+ #. No packets seen in TxBytes and RxBytes corresponding to IMSI=1 and LCID=4
+
+If above criteria do not match, the test case is considered to be failed
 
 .. _sec-lte-amc-tests:
 
@@ -1025,6 +1020,17 @@
 PDU are verified to check for an exact match with the test vector.
 
 
+The AM RLC implementation features an additional test suite,
+``lte-rlc-am-e2e``, which test the correct retransmission of RLC PDUs
+in presence of channel losses. The test instantiates an RLC AM
+transmitter and a receiver, and interposes a channel that randomly
+drops packet according to a fixed loss probability. Different test
+cases are instantiated using different ``RngRun`` values and different
+loss probability values. Each test case passes if at the end of the
+simulation all SDUs are correctly delivered to the upper layers of the
+receiving RLC AM entity.
+
+
 RRC
 ---
 
diff -Naur ns-3.22/src/lte/helper/emu-epc-helper.cc ns-3.23/src/lte/helper/emu-epc-helper.cc
--- ns-3.22/src/lte/helper/emu-epc-helper.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/emu-epc-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -69,6 +69,7 @@
 {
   static TypeId tid = TypeId ("ns3::EmuEpcHelper")
     .SetParent<EpcHelper> ()
+    .SetGroupName("Lte")
     .AddConstructor<EmuEpcHelper> ()
     .AddAttribute ("sgwDeviceName", 
                    "The name of the device used for the S1-U interface of the SGW",
diff -Naur ns-3.22/src/lte/helper/epc-helper.cc ns-3.23/src/lte/helper/epc-helper.cc
--- ns-3.22/src/lte/helper/epc-helper.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/epc-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -47,6 +47,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcHelper")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     ;
   return tid;
 }
diff -Naur ns-3.22/src/lte/helper/lte-stats-calculator.cc ns-3.23/src/lte/helper/lte-stats-calculator.cc
--- ns-3.22/src/lte/helper/lte-stats-calculator.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/lte-stats-calculator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -52,6 +52,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteStatsCalculator")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteStatsCalculator> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/helper/mac-stats-calculator.cc ns-3.23/src/lte/helper/mac-stats-calculator.cc
--- ns-3.22/src/lte/helper/mac-stats-calculator.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/mac-stats-calculator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -47,6 +47,7 @@
 {
   static TypeId tid = TypeId ("ns3::MacStatsCalculator")
     .SetParent<LteStatsCalculator> ()
+    .SetGroupName("Lte")
     .AddConstructor<MacStatsCalculator> ()
     .AddAttribute ("DlOutputFilename",
                    "Name of the file where the downlink results will be saved.",
diff -Naur ns-3.22/src/lte/helper/phy-rx-stats-calculator.cc ns-3.23/src/lte/helper/phy-rx-stats-calculator.cc
--- ns-3.22/src/lte/helper/phy-rx-stats-calculator.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/phy-rx-stats-calculator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::PhyRxStatsCalculator")
     .SetParent<LteStatsCalculator> ()
+    .SetGroupName("Lte")
     .AddConstructor<PhyRxStatsCalculator> ()
     .AddAttribute ("DlRxOutputFilename",
                    "Name of the file where the downlink results will be saved.",
diff -Naur ns-3.22/src/lte/helper/phy-stats-calculator.cc ns-3.23/src/lte/helper/phy-stats-calculator.cc
--- ns-3.22/src/lte/helper/phy-stats-calculator.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/phy-stats-calculator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -48,6 +48,7 @@
 {
   static TypeId tid = TypeId ("ns3::PhyStatsCalculator")
     .SetParent<LteStatsCalculator> ()
+    .SetGroupName("Lte")
     .AddConstructor<PhyStatsCalculator> ()
     .AddAttribute ("DlRsrpSinrFilename",
                    "Name of the file where the RSRP/SINR statistics will be saved.",
diff -Naur ns-3.22/src/lte/helper/phy-tx-stats-calculator.cc ns-3.23/src/lte/helper/phy-tx-stats-calculator.cc
--- ns-3.22/src/lte/helper/phy-tx-stats-calculator.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/phy-tx-stats-calculator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::PhyTxStatsCalculator")
     .SetParent<LteStatsCalculator> ()
+    .SetGroupName("Lte")
     .AddConstructor<PhyTxStatsCalculator> ()
     .AddAttribute ("DlTxOutputFilename",
                    "Name of the file where the downlink results will be saved.",
diff -Naur ns-3.22/src/lte/helper/point-to-point-epc-helper.cc ns-3.23/src/lte/helper/point-to-point-epc-helper.cc
--- ns-3.22/src/lte/helper/point-to-point-epc-helper.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/point-to-point-epc-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -112,6 +112,7 @@
 {
   static TypeId tid = TypeId ("ns3::PointToPointEpcHelper")
     .SetParent<EpcHelper> ()
+    .SetGroupName("Lte")
     .AddConstructor<PointToPointEpcHelper> ()
     .AddAttribute ("S1uLinkDataRate", 
                    "The data rate to be used for the next S1-U link to be created",
diff -Naur ns-3.22/src/lte/helper/radio-bearer-stats-calculator.cc ns-3.23/src/lte/helper/radio-bearer-stats-calculator.cc
--- ns-3.22/src/lte/helper/radio-bearer-stats-calculator.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/radio-bearer-stats-calculator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -59,6 +59,7 @@
   static TypeId tid =
     TypeId ("ns3::RadioBearerStatsCalculator")
     .SetParent<LteStatsCalculator> ().AddConstructor<RadioBearerStatsCalculator> ()
+    .SetGroupName("Lte")
     .AddAttribute ("StartTime", "Start time of the on going epoch.", 
                    TimeValue (Seconds (0.)),
                    MakeTimeAccessor (&RadioBearerStatsCalculator::SetStartTime,
diff -Naur ns-3.22/src/lte/helper/radio-environment-map-helper.cc ns-3.23/src/lte/helper/radio-environment-map-helper.cc
--- ns-3.22/src/lte/helper/radio-environment-map-helper.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/helper/radio-environment-map-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -70,6 +70,7 @@
   NS_LOG_FUNCTION ("RadioEnvironmentMapHelper::GetTypeId");
   static TypeId tid = TypeId ("ns3::RadioEnvironmentMapHelper")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<RadioEnvironmentMapHelper> ()
     .AddAttribute ("ChannelPath", "The path to the channel for which the Radio Environment Map is to be generated",
                    StringValue ("/ChannelList/0"),
diff -Naur ns-3.22/src/lte/model/a2-a4-rsrq-handover-algorithm.cc ns-3.23/src/lte/model/a2-a4-rsrq-handover-algorithm.cc
--- ns-3.22/src/lte/model/a2-a4-rsrq-handover-algorithm.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/a2-a4-rsrq-handover-algorithm.cc	2015-05-13 11:05:27.000000000 -0700
@@ -64,6 +64,7 @@
 {
   static TypeId tid = TypeId ("ns3::A2A4RsrqHandoverAlgorithm")
     .SetParent<LteHandoverAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<A2A4RsrqHandoverAlgorithm> ()
     .AddAttribute ("ServingCellThreshold",
                    "If the RSRQ of the serving cell is worse than this "
diff -Naur ns-3.22/src/lte/model/a3-rsrp-handover-algorithm.cc ns-3.23/src/lte/model/a3-rsrp-handover-algorithm.cc
--- ns-3.22/src/lte/model/a3-rsrp-handover-algorithm.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/a3-rsrp-handover-algorithm.cc	2015-05-13 11:05:27.000000000 -0700
@@ -51,6 +51,7 @@
 {
   static TypeId tid = TypeId ("ns3::A3RsrpHandoverAlgorithm")
     .SetParent<LteHandoverAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<A3RsrpHandoverAlgorithm> ()
     .AddAttribute ("Hysteresis",
                    "Handover margin (hysteresis) in dB "
diff -Naur ns-3.22/src/lte/model/cqa-ff-mac-scheduler.cc ns-3.23/src/lte/model/cqa-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/cqa-ff-mac-scheduler.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/cqa-ff-mac-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -300,6 +300,7 @@
 {
   static TypeId tid = TypeId ("ns3::CqaFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<CqaFfMacScheduler>()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/epc-enb-application.cc ns-3.23/src/lte/model/epc-enb-application.cc
--- ns-3.22/src/lte/model/epc-enb-application.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/epc-enb-application.cc	2015-05-13 11:05:27.000000000 -0700
@@ -62,7 +62,8 @@
 EpcEnbApplication::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::EpcEnbApplication")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Lte");
   return tid;
 }
 
diff -Naur ns-3.22/src/lte/model/epc-gtpu-header.cc ns-3.23/src/lte/model/epc-gtpu-header.cc
--- ns-3.22/src/lte/model/epc-gtpu-header.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/epc-gtpu-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,9 +35,9 @@
 TypeId
 GtpuHeader::GetTypeId (void)
 {
-  static TypeId tid =
-    TypeId ("ns3::GtpuHeader")
+  static TypeId tid = TypeId ("ns3::GtpuHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<GtpuHeader> ();
   return tid;
 }
diff -Naur ns-3.22/src/lte/model/epc-mme.cc ns-3.23/src/lte/model/epc-mme.cc
--- ns-3.22/src/lte/model/epc-mme.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/epc-mme.cc	2015-05-13 11:05:27.000000000 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcMme")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcMme> ()
     ;
   return tid;
diff -Naur ns-3.22/src/lte/model/epc-sgw-pgw-application.cc ns-3.23/src/lte/model/epc-sgw-pgw-application.cc
--- ns-3.22/src/lte/model/epc-sgw-pgw-application.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/epc-sgw-pgw-application.cc	2015-05-13 11:05:27.000000000 -0700
@@ -100,7 +100,8 @@
 EpcSgwPgwApplication::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::EpcSgwPgwApplication")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Lte");
   return tid;
 }
 
diff -Naur ns-3.22/src/lte/model/epc-ue-nas.cc ns-3.23/src/lte/model/epc-ue-nas.cc
--- ns-3.22/src/lte/model/epc-ue-nas.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/epc-ue-nas.cc	2015-05-13 11:05:27.000000000 -0700
@@ -85,6 +85,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcUeNas")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcUeNas> ()
     .AddTraceSource ("StateTransition",
                      "fired upon every UE NAS state transition",
diff -Naur ns-3.22/src/lte/model/epc-x2.cc ns-3.23/src/lte/model/epc-x2.cc
--- ns-3.22/src/lte/model/epc-x2.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/epc-x2.cc	2015-05-13 11:05:27.000000000 -0700
@@ -109,7 +109,8 @@
 EpcX2::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::EpcX2")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Lte");
   return tid;
 }
 
diff -Naur ns-3.22/src/lte/model/epc-x2-header.cc ns-3.23/src/lte/model/epc-x2-header.cc
--- ns-3.22/src/lte/model/epc-x2-header.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/epc-x2-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcX2Header")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcX2Header> ()
   ;
   return tid;
@@ -173,6 +174,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcX2HandoverRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcX2HandoverRequestHeader> ()
   ;
   return tid;
@@ -457,6 +459,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcX2HandoverRequestAckHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcX2HandoverRequestAckHeader> ()
   ;
   return tid;
@@ -682,6 +685,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcX2HandoverPreparationFailureHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcX2HandoverPreparationFailureHeader> ()
   ;
   return tid;
@@ -807,6 +811,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcX2SnStatusTransferHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcX2SnStatusTransferHeader> ()
   ;
   return tid;
@@ -997,6 +1002,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcX2UeContextReleaseHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcX2UeContextReleaseHeader> ()
   ;
   return tid;
@@ -1102,6 +1108,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcX2LoadInformationHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcX2LoadInformationHeader> ()
   ;
   return tid;
@@ -1330,6 +1337,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpcX2ResourceStatusUpdateHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpcX2ResourceStatusUpdateHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/eps-bearer-tag.cc ns-3.23/src/lte/model/eps-bearer-tag.cc
--- ns-3.22/src/lte/model/eps-bearer-tag.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/eps-bearer-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::EpsBearerTag")
     .SetParent<Tag> ()
+    .SetGroupName("Lte")
     .AddConstructor<EpsBearerTag> ()
     .AddAttribute ("rnti", "The rnti that indicates the UE which packet belongs",
                    UintegerValue (0),
diff -Naur ns-3.22/src/lte/model/fdbet-ff-mac-scheduler.cc ns-3.23/src/lte/model/fdbet-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/fdbet-ff-mac-scheduler.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/fdbet-ff-mac-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -249,6 +249,7 @@
 {
   static TypeId tid = TypeId ("ns3::FdBetFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<FdBetFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/fdmt-ff-mac-scheduler.cc ns-3.23/src/lte/model/fdmt-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/fdmt-ff-mac-scheduler.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/fdmt-ff-mac-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -248,6 +248,7 @@
 {
   static TypeId tid = TypeId ("ns3::FdMtFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<FdMtFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/fdtbfq-ff-mac-scheduler.cc ns-3.23/src/lte/model/fdtbfq-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/fdtbfq-ff-mac-scheduler.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/fdtbfq-ff-mac-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -253,6 +253,7 @@
 {
   static TypeId tid = TypeId ("ns3::FdTbfqFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<FdTbfqFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/ff-mac-scheduler.cc ns-3.23/src/lte/model/ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/ff-mac-scheduler.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/ff-mac-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -54,6 +54,7 @@
 {
   static TypeId tid = TypeId ("ns3::FfMacScheduler")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddAttribute ("UlCqiFilter",
                    "The filter to apply on UL CQIs received",
                    EnumValue (FfMacScheduler::ALL_UL_CQI),
diff -Naur ns-3.22/src/lte/model/lte-amc.cc ns-3.23/src/lte/model/lte-amc.cc
--- ns-3.22/src/lte/model/lte-amc.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/lte-amc.cc	2015-05-13 11:05:27.000000000 -0700
@@ -234,6 +234,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteAmc")
   .SetParent<Object> ()
+  .SetGroupName("Lte")
   .AddConstructor<LteAmc> ()
   .AddAttribute ("Ber",
                  "The requested BER in assigning MCS (default is 0.00005).",
diff -Naur ns-3.22/src/lte/model/lte-anr.cc ns-3.23/src/lte/model/lte-anr.cc
--- ns-3.22/src/lte/model/lte-anr.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/lte-anr.cc	2015-05-13 11:05:27.000000000 -0700
@@ -58,6 +58,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteAnr")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddAttribute ("Threshold",
                    "Minimum RSRQ range value required for detecting a neighbour cell",
                    UintegerValue (0),
diff -Naur ns-3.22/src/lte/model/lte-asn1-header.cc ns-3.23/src/lte/model/lte-asn1-header.cc
--- ns-3.22/src/lte/model/lte-asn1-header.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/lte-asn1-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -36,6 +36,7 @@
 {
   static TypeId tid = TypeId ("ns3::Asn1Header")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/lte/model/lte-chunk-processor.cc ns-3.23/src/lte/model/lte-chunk-processor.cc
--- ns-3.22/src/lte/model/lte-chunk-processor.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/lte-chunk-processor.cc	2015-05-13 11:05:27.000000000 -0700
@@ -86,4 +86,18 @@
 }
 
 
+  
+void
+LteSpectrumValueCatcher::ReportValue (const SpectrumValue& value)
+{
+  m_value = value.Copy ();
+}
+
+Ptr<SpectrumValue> 
+LteSpectrumValueCatcher::GetValue ()
+{
+  return m_value;
+}
+
+
 } // namespace ns3
diff -Naur ns-3.22/src/lte/model/lte-chunk-processor.h ns-3.23/src/lte/model/lte-chunk-processor.h
--- ns-3.22/src/lte/model/lte-chunk-processor.h	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/lte-chunk-processor.h	2015-05-13 11:05:27.000000000 -0700
@@ -88,6 +88,34 @@
   std::vector<LteChunkProcessorCallback> m_lteChunkProcessorCallbacks;
 };
 
+
+/**
+ * A sink to be plugged to the callback of LteChunkProcessor allowing
+ * to save and later retrieve the latest reported value 
+ * 
+ */
+class LteSpectrumValueCatcher
+{
+public:
+
+  /** 
+   * function to be plugged to LteChunkProcessor::AddCallback ()
+   * 
+   * \param value 
+   */
+  void ReportValue (const SpectrumValue& value);
+
+  /** 
+   * 
+   * 
+   * \return the latest value reported by the LteChunkProcessor
+   */
+  Ptr<SpectrumValue> GetValue ();
+  
+private:
+  Ptr<SpectrumValue> m_value;
+};
+
 } // namespace ns3
 
 
diff -Naur ns-3.22/src/lte/model/lte-enb-mac.cc ns-3.23/src/lte/model/lte-enb-mac.cc
--- ns-3.22/src/lte/model/lte-enb-mac.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/lte/model/lte-enb-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -314,6 +314,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteEnbMac")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteEnbMac> ()
     .AddAttribute ("NumberOfRaPreambles",
                    "how many random access preambles are available for the contention based RACH process",
diff -Naur ns-3.22/src/lte/model/lte-enb-phy.cc ns-3.23/src/lte/model/lte-enb-phy.cc
--- ns-3.22/src/lte/model/lte-enb-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-enb-phy.cc	2015-05-13 11:05:27.000000000 -0700
@@ -152,7 +152,6 @@
   m_harqPhyModule = Create <LteHarqPhy> ();
   m_downlinkSpectrumPhy->SetHarqPhyModule (m_harqPhyModule);
   m_uplinkSpectrumPhy->SetHarqPhyModule (m_harqPhyModule);
-  Simulator::ScheduleNow (&LteEnbPhy::StartFrame, this);
 }
 
 TypeId
@@ -160,6 +159,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteEnbPhy")
     .SetParent<LtePhy> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteEnbPhy> ()
     .AddAttribute ("TxPower",
                    "Transmission power in dBm",
@@ -249,6 +249,25 @@
 LteEnbPhy::DoInitialize ()
 {
   NS_LOG_FUNCTION (this);
+  bool haveNodeId = false;
+  uint32_t nodeId = 0;
+  if (m_netDevice != 0)
+    {
+      Ptr<Node> node = m_netDevice->GetNode ();
+      if (node != 0)
+        {
+          nodeId = node->GetId ();
+          haveNodeId = true;
+        }
+    }
+  if (haveNodeId)
+    {
+      Simulator::ScheduleWithContext (nodeId, Seconds (0), &LteEnbPhy::StartFrame, this);
+    }
+  else
+    {
+      Simulator::ScheduleNow (&LteEnbPhy::StartFrame, this);
+    }
   Ptr<SpectrumValue> noisePsd = LteSpectrumValueHelper::CreateNoisePowerSpectralDensity (m_ulEarfcn, m_ulBandwidth, m_noiseFigure);
   m_uplinkSpectrumPhy->SetNoisePowerSpectralDensity (noisePsd);
   LtePhy::DoInitialize ();
diff -Naur ns-3.22/src/lte/model/lte-enb-rrc.cc ns-3.23/src/lte/model/lte-enb-rrc.cc
--- ns-3.22/src/lte/model/lte-enb-rrc.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-enb-rrc.cc	2015-05-13 11:05:26.000000000 -0700
@@ -1344,6 +1344,7 @@
   NS_LOG_FUNCTION ("LteEnbRrc::GetTypeId");
   static TypeId tid = TypeId ("ns3::LteEnbRrc")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteEnbRrc> ()
     .AddAttribute ("UeMap", "List of UeManager by C-RNTI.",
                    ObjectMapValue (),
diff -Naur ns-3.22/src/lte/model/lte-ffr-algorithm.cc ns-3.23/src/lte/model/lte-ffr-algorithm.cc
--- ns-3.22/src/lte/model/lte-ffr-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-ffr-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -54,6 +54,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteFfrAlgorithm")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddAttribute ("FrCellTypeId",
                    "Downlink FR cell type ID for automatic configuration,"
                    "default value is 0 and it means that user needs to configure FR algorithm manually,"
diff -Naur ns-3.22/src/lte/model/lte-ffr-distributed-algorithm.cc ns-3.23/src/lte/model/lte-ffr-distributed-algorithm.cc
--- ns-3.22/src/lte/model/lte-ffr-distributed-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-ffr-distributed-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteFfrDistributedAlgorithm")
     .SetParent<LteFfrAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteFfrDistributedAlgorithm> ()
     .AddAttribute ("CalculationInterval",
                    "Time interval between calculation of Edge sub-band, Default value 1 second",
diff -Naur ns-3.22/src/lte/model/lte-ffr-enhanced-algorithm.cc ns-3.23/src/lte/model/lte-ffr-enhanced-algorithm.cc
--- ns-3.22/src/lte/model/lte-ffr-enhanced-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-ffr-enhanced-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -120,6 +120,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteFfrEnhancedAlgorithm")
     .SetParent<LteFfrAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteFfrEnhancedAlgorithm> ()
     .AddAttribute ("UlSubBandOffset",
                    "Uplink SubBand Offset for this cell in number of Resource Block Groups",
diff -Naur ns-3.22/src/lte/model/lte-ffr-soft-algorithm.cc ns-3.23/src/lte/model/lte-ffr-soft-algorithm.cc
--- ns-3.22/src/lte/model/lte-ffr-soft-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-ffr-soft-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -118,6 +118,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteFfrSoftAlgorithm")
     .SetParent<LteFfrAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteFfrSoftAlgorithm> ()
     .AddAttribute ("UlCommonSubBandwidth",
                    "Uplink Medium (Common) SubBandwidth Configuration in number of Resource Block Groups",
diff -Naur ns-3.22/src/lte/model/lte-fr-hard-algorithm.cc ns-3.23/src/lte/model/lte-fr-hard-algorithm.cc
--- ns-3.22/src/lte/model/lte-fr-hard-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-fr-hard-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -113,6 +113,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteFrHardAlgorithm")
     .SetParent<LteFfrAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteFrHardAlgorithm> ()
     .AddAttribute ("UlSubBandOffset",
                    "Uplink Offset in number of Resource Block Groups",
diff -Naur ns-3.22/src/lte/model/lte-fr-no-op-algorithm.cc ns-3.23/src/lte/model/lte-fr-no-op-algorithm.cc
--- ns-3.22/src/lte/model/lte-fr-no-op-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-fr-no-op-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -58,6 +58,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteFrNoOpAlgorithm")
     .SetParent<LteFfrAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteFrNoOpAlgorithm> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/lte-fr-soft-algorithm.cc ns-3.23/src/lte/model/lte-fr-soft-algorithm.cc
--- ns-3.22/src/lte/model/lte-fr-soft-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-fr-soft-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -116,6 +116,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteFrSoftAlgorithm")
     .SetParent<LteFfrAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteFrSoftAlgorithm> ()
     .AddAttribute ("UlEdgeSubBandOffset",
                    "Uplink Edge SubBand Offset in number of Resource Block Groups",
diff -Naur ns-3.22/src/lte/model/lte-fr-strict-algorithm.cc ns-3.23/src/lte/model/lte-fr-strict-algorithm.cc
--- ns-3.22/src/lte/model/lte-fr-strict-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-fr-strict-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -118,6 +118,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteFrStrictAlgorithm")
     .SetParent<LteFfrAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteFrStrictAlgorithm> ()
     .AddAttribute ("UlCommonSubBandwidth",
                    "Uplink Common SubBandwidth Configuration in number of Resource Block Groups",
diff -Naur ns-3.22/src/lte/model/lte-handover-algorithm.cc ns-3.23/src/lte/model/lte-handover-algorithm.cc
--- ns-3.22/src/lte/model/lte-handover-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-handover-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -44,6 +44,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteHandoverAlgorithm")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/lte/model/lte-interference.cc ns-3.23/src/lte/model/lte-interference.cc
--- ns-3.22/src/lte/model/lte-interference.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-interference.cc	2015-05-13 11:05:26.000000000 -0700
@@ -62,6 +62,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteInterference")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/lte/model/lte-pdcp.cc ns-3.23/src/lte/model/lte-pdcp.cc
--- ns-3.22/src/lte/model/lte-pdcp.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-pdcp.cc	2015-05-13 11:05:26.000000000 -0700
@@ -85,6 +85,7 @@
 {
   static TypeId tid = TypeId ("ns3::LtePdcp")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddTraceSource ("TxPDU",
                      "PDU transmission notified to the RLC.",
                      MakeTraceSourceAccessor (&LtePdcp::m_txPdu),
diff -Naur ns-3.22/src/lte/model/lte-pdcp-header.cc ns-3.23/src/lte/model/lte-pdcp-header.cc
--- ns-3.22/src/lte/model/lte-pdcp-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-pdcp-header.cc	2015-05-13 11:05:26.000000000 -0700
@@ -70,6 +70,7 @@
 {
   static TypeId tid = TypeId ("ns3::LtePdcpHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<LtePdcpHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/lte-pdcp-tag.cc ns-3.23/src/lte/model/lte-pdcp-tag.cc
--- ns-3.22/src/lte/model/lte-pdcp-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-pdcp-tag.cc	2015-05-13 11:05:26.000000000 -0700
@@ -46,6 +46,7 @@
 {
   static TypeId tid = TypeId ("ns3::PdcpTag")
     .SetParent<Tag> ()
+    .SetGroupName("Lte")
     .AddConstructor<PdcpTag> ();
   return tid;
 }
diff -Naur ns-3.22/src/lte/model/lte-phy.cc ns-3.23/src/lte/model/lte-phy.cc
--- ns-3.22/src/lte/model/lte-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-phy.cc	2015-05-13 11:05:26.000000000 -0700
@@ -60,6 +60,7 @@
 {
   static TypeId tid = TypeId ("ns3::LtePhy")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/lte/model/lte-phy-tag.cc ns-3.23/src/lte/model/lte-phy-tag.cc
--- ns-3.22/src/lte/model/lte-phy-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-phy-tag.cc	2015-05-13 11:05:26.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::LtePhyTag")
     .SetParent<Tag> ()
+    .SetGroupName("Lte")
     .AddConstructor<LtePhyTag> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/lte-radio-bearer-tag.cc ns-3.23/src/lte/model/lte-radio-bearer-tag.cc
--- ns-3.22/src/lte/model/lte-radio-bearer-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-radio-bearer-tag.cc	2015-05-13 11:05:26.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteRadioBearerTag")
     .SetParent<Tag> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteRadioBearerTag> ()
     .AddAttribute ("rnti", "The rnti that indicates the UE to which packet belongs",
                    UintegerValue (0),
diff -Naur ns-3.22/src/lte/model/lte-rlc-am.cc ns-3.23/src/lte/model/lte-rlc-am.cc
--- ns-3.22/src/lte/model/lte-rlc-am.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-am.cc	2015-05-13 11:05:26.000000000 -0700
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: Manuel Requena <manuel.requena@cttc.es>
+ *         Nicola Baldo <nbaldo@cttc.es>
  */
 
 #include "ns3/simulator.h"
@@ -26,12 +27,14 @@
 #include "ns3/lte-rlc-sdu-status-tag.h"
 #include "ns3/lte-rlc-tag.h"
 
+
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("LteRlcAm");
 
 NS_OBJECT_ENSURE_REGISTERED (LteRlcAm);
 
+
 LteRlcAm::LteRlcAm ()
 {
   NS_LOG_FUNCTION (this);
@@ -73,8 +76,7 @@
   m_reassemblingState = WAITING_S0_FULL;
   m_expectedSeqNumber = 0;
 
-  // Timers
-  m_pollRetransmitTimerValue = MilliSeconds (100);
+  m_pollRetransmitTimerJustExpired = false;
 }
 
 LteRlcAm::~LteRlcAm ()
@@ -87,12 +89,29 @@
 {
   static TypeId tid = TypeId ("ns3::LteRlcAm")
     .SetParent<LteRlc> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteRlcAm> ()
     .AddAttribute ("PollRetransmitTimer",
-                   "Value of the t-PollRetransmit (See section 7.3 of 3GPP TS 36.322)",
-                   TimeValue (MilliSeconds (100)),
+                   "Value of the t-PollRetransmit timer (See section 7.3 of 3GPP TS 36.322)",
+                   TimeValue (MilliSeconds (20)),
                    MakeTimeAccessor (&LteRlcAm::m_pollRetransmitTimerValue),
                    MakeTimeChecker ())
+    .AddAttribute ("ReorderingTimer",
+                   "Value of the t-Reordering timer (See section 7.3 of 3GPP TS 36.322)",
+                   TimeValue (MilliSeconds (10)),
+                   MakeTimeAccessor (&LteRlcAm::m_reorderingTimerValue),
+                   MakeTimeChecker ())
+    .AddAttribute ("StatusProhibitTimer",
+                   "Value of the t-StatusProhibit timer (See section 7.3 of 3GPP TS 36.322)",
+                   TimeValue (MilliSeconds (10)),
+                   MakeTimeAccessor (&LteRlcAm::m_statusProhibitTimerValue),
+                   MakeTimeChecker ())
+    .AddAttribute ("ReportBufferStatusTimer",
+                   "How much to wait to issue a new Report Buffer Status since the last time "
+                   "a new SDU was received",     
+                   TimeValue (MilliSeconds (20)),
+                   MakeTimeAccessor (&LteRlcAm::m_rbsTimerValue),
+                   MakeTimeChecker ())
     .AddAttribute ("TxOpportunityForRetxAlwaysBigEnough",
                    "If true, always pretend that the size of a TxOpportunity is big enough "
                    "for retransmission. If false (default and realistic behavior), no retx "
@@ -112,6 +131,7 @@
   m_pollRetransmitTimer.Cancel ();
   m_reorderingTimer.Cancel ();
   m_statusProhibitTimer.Cancel ();
+  m_rbsTimer.Cancel ();
 
   m_txonBuffer.clear ();
   m_txonBufferSize = 0;
@@ -156,6 +176,8 @@
 
   /** Report Buffer Status */
   DoReportBufferStatus ();
+  m_rbsTimer.Cancel ();
+  m_rbsTimer = Simulator::Schedule (m_rbsTimerValue, &LteRlcAm::ExpireRbsTimer, this);
 }
 
 
@@ -194,7 +216,42 @@
       Ptr<Packet> packet = Create<Packet> ();
       LteRlcAmHeader rlcAmHeader;
       rlcAmHeader.SetControlPdu (LteRlcAmHeader::STATUS_PDU);
-      rlcAmHeader.SetAckSn (m_vrR);
+     
+      NS_LOG_LOGIC ("Check for SNs to NACK from " << m_vrR.GetValue() << " to " << m_vrMs.GetValue());
+      SequenceNumber10 sn;
+      sn.SetModulusBase (m_vrR);
+      std::map<uint16_t, PduBuffer>::iterator pduIt;
+      for (sn = m_vrR; sn < m_vrMs; sn++) 
+        {
+          NS_LOG_LOGIC ("SN = " << sn);          
+          if (!rlcAmHeader.OneMoreNackWouldFitIn (bytes))
+            {
+              NS_LOG_LOGIC ("Can't fit more NACKs in STATUS PDU");
+              break;
+            }          
+          pduIt = m_rxonBuffer.find (sn.GetValue ());
+          if (pduIt == m_rxonBuffer.end () || (!(pduIt->second.m_pduComplete)))
+            {
+              NS_LOG_LOGIC ("adding NACK_SN " << sn.GetValue ());
+              rlcAmHeader.PushNack (sn.GetValue ());              
+            }          
+        }
+      NS_LOG_LOGIC ("SN at end of NACK loop = " << sn);
+      // 3GPP TS 36.322 section 6.2.2.1.4 ACK SN
+      // find the  SN of the next not received RLC Data PDU 
+      // which is not reported as missing in the STATUS PDU. 
+      pduIt = m_rxonBuffer.find (sn.GetValue ());
+      while ((sn < m_vrMs) && (pduIt != m_rxonBuffer.end ()) && (pduIt->second.m_pduComplete))            
+        {
+          NS_LOG_LOGIC ("SN = " << sn << " < " << m_vrMs << " = " << (sn < m_vrMs));
+          sn++;
+          NS_LOG_LOGIC ("SN = " << sn);
+          pduIt = m_rxonBuffer.find (sn.GetValue ());
+        }
+      
+      NS_ASSERT_MSG (sn <= m_vrMs, "first SN not reported as missing = " << sn << ", VR(MS) = " << m_vrMs);      
+      rlcAmHeader.SetAckSn (sn); 
+
 
       NS_LOG_LOGIC ("RLC header: " << rlcAmHeader);
       packet->AddHeader (rlcAmHeader);
@@ -211,38 +268,114 @@
 
       m_statusPduRequested = false;
       m_statusPduBufferSize = 0;
+      m_statusProhibitTimer = Simulator::Schedule (m_statusProhibitTimerValue,
+                                                   &LteRlcAm::ExpireStatusProhibitTimer, this);
       return;
     }
   else if ( m_retxBufferSize > 0 )
     {
+      NS_LOG_LOGIC ("retxBufferSize = " << m_retxBufferSize);      
       NS_LOG_LOGIC ("Sending data from Retransmission Buffer");
+      NS_ASSERT (m_vtA < m_vtS);
+      SequenceNumber10 sn;
+      sn.SetModulusBase (m_vtA);
+      bool found = false;
+      for (sn = m_vtA; sn < m_vtS; sn++) 
+        {
+          uint16_t seqNumberValue = sn.GetValue ();
+          NS_LOG_LOGIC ("SN = " << seqNumberValue << " m_pdu " << m_retxBuffer.at (seqNumberValue).m_pdu);
+
+          if (m_retxBuffer.at (seqNumberValue).m_pdu != 0)
+            {            
+
+              Ptr<Packet> packet = m_retxBuffer.at (seqNumberValue).m_pdu->Copy ();
+              
+              if (( packet->GetSize () <= bytes )
+                  || m_txOpportunityForRetxAlwaysBigEnough)
+                {
+                  found = true;
+                  // According to 5.2.1, the data field is left as is, but we rebuild the header
+                  LteRlcAmHeader rlcAmHeader;
+                  packet->RemoveHeader (rlcAmHeader);
+                  NS_LOG_LOGIC ("old AM RLC header: " << rlcAmHeader);
+
+                  // Calculate the Polling Bit (5.2.2.1)
+                  rlcAmHeader.SetPollingBit (LteRlcAmHeader::STATUS_REPORT_NOT_REQUESTED);
+
+                  NS_LOG_LOGIC ("polling conditions: m_txonBuffer.empty=" << m_txonBuffer.empty () 
+                                << " retxBufferSize="  << m_retxBufferSize
+                                << " packet->GetSize ()=" << packet->GetSize ());
+                  if (((m_txonBuffer.empty ()) && (m_retxBufferSize == packet->GetSize () + rlcAmHeader.GetSerializedSize ())) 
+                      || (m_vtS >= m_vtMs)
+                      || m_pollRetransmitTimerJustExpired)
+                    {
+                      m_pollRetransmitTimerJustExpired = false;
+                      rlcAmHeader.SetPollingBit (LteRlcAmHeader::STATUS_REPORT_IS_REQUESTED);
+                      m_pduWithoutPoll = 0;
+                      m_byteWithoutPoll = 0;
+
+                      m_pollSn = m_vtS - 1;
+                      NS_LOG_LOGIC ("New POLL_SN = " << m_pollSn);
+
+                      if (! m_pollRetransmitTimer.IsRunning () )
+                        {
+                          NS_LOG_LOGIC ("Start PollRetransmit timer");
+
+                          m_pollRetransmitTimer = Simulator::Schedule (m_pollRetransmitTimerValue,
+                                                                       &LteRlcAm::ExpirePollRetransmitTimer, this);
+                        }
+                      else
+                        {
+                          NS_LOG_LOGIC ("Restart PollRetransmit timer");
+
+                          m_pollRetransmitTimer.Cancel ();
+                          m_pollRetransmitTimer = Simulator::Schedule (m_pollRetransmitTimerValue,
+                                                                       &LteRlcAm::ExpirePollRetransmitTimer, this);
+                        }
+                    }
 
-      Ptr<Packet> packet = m_retxBuffer.at (m_vtA.GetValue ()).m_pdu->Copy ();
+                  packet->AddHeader (rlcAmHeader);
+                  NS_LOG_LOGIC ("new AM RLC header: " << rlcAmHeader);
+                  
+                  // Send RLC PDU to MAC layer
+                  LteMacSapProvider::TransmitPduParameters params;
+                  params.pdu = packet;
+                  params.rnti = m_rnti;
+                  params.lcid = m_lcid;
+                  params.layer = layer;
+                  params.harqProcessId = harqId;
+                  
+                  m_macSapProvider->TransmitPdu (params);
+
+                  m_retxBuffer.at (seqNumberValue).m_retxCount++;
+                  NS_LOG_INFO ("Incr RETX_COUNT for SN = " << seqNumberValue);
+                  if (m_retxBuffer.at (seqNumberValue).m_retxCount >= m_maxRetxThreshold)
+                    {
+                      NS_LOG_INFO ("Max RETX_COUNT for SN = " << seqNumberValue);
+                    }
 
-      if (( packet->GetSize () <= bytes )
-          || m_txOpportunityForRetxAlwaysBigEnough)
-        {
-          LteRlcAmHeader rlcAmHeader;
-          packet->PeekHeader (rlcAmHeader);
-          NS_LOG_LOGIC ("RLC header: " << rlcAmHeader);
-
-          // Send RLC PDU to MAC layer
-          LteMacSapProvider::TransmitPduParameters params;
-          params.pdu = packet;
-          params.rnti = m_rnti;
-          params.lcid = m_lcid;
-          params.layer = layer;
-          params.harqProcessId = harqId;
+                  NS_LOG_INFO ("Move SN = " << seqNumberValue << " back to txedBuffer");
+                  m_txedBuffer.at (seqNumberValue).m_pdu = m_retxBuffer.at (seqNumberValue).m_pdu->Copy ();
+                  m_txedBuffer.at (seqNumberValue).m_retxCount = m_retxBuffer.at (seqNumberValue).m_retxCount;
+                  m_txedBufferSize += m_txedBuffer.at (seqNumberValue).m_pdu->GetSize ();
+
+                  m_retxBufferSize -= m_retxBuffer.at (seqNumberValue).m_pdu->GetSize ();
+                  m_retxBuffer.at (seqNumberValue).m_pdu = 0;
+                  m_retxBuffer.at (seqNumberValue).m_retxCount = 0;
+                  
+                  NS_LOG_LOGIC ("retxBufferSize = " << m_retxBufferSize);
 
-          m_macSapProvider->TransmitPdu (params);
-          return;
-        }
-      else
-        {
-          NS_LOG_LOGIC ("TxOpportunity (size = " << bytes << ") too small for retransmission of the packet (size = " << packet->GetSize () << ")");
-          NS_LOG_LOGIC ("Waiting for bigger TxOpportunity");
-          return;
+                  return;
+                }
+              else
+                {
+                  NS_LOG_LOGIC ("TxOpportunity (size = " << bytes << ") too small for retransmission of the packet (size = " << packet->GetSize () << ")");
+                  NS_LOG_LOGIC ("Waiting for bigger TxOpportunity");
+                  return;
+                }
+            }
         }
+      NS_ASSERT_MSG (found, "m_retxBufferSize > 0, but no PDU considered for retx found");
     }
   else if ( m_txonBufferSize > 0 )
     {
@@ -255,50 +388,14 @@
         return;
       }
 
-      NS_LOG_LOGIC ("Sending data from Transmission Buffer");
-    }
-  else if ( m_txedBufferSize > 0 )
-    {
-      NS_LOG_LOGIC ("Sending data from Transmitted Buffer");
-
-      NS_LOG_INFO ("VT(A)     = " << m_vtA);
-      NS_LOG_INFO ("VT(S)     = " << m_vtS);
-
-      uint16_t vta = m_vtA.GetValue ();
-      Ptr<Packet> packet = m_txedBuffer.at (vta)->Copy ();
-
-      if (( packet->GetSize () <= bytes )
-          || m_txOpportunityForRetxAlwaysBigEnough)
-        {
-          NS_LOG_INFO ("Move SN = " << vta << " to retxBuffer");
-          m_retxBuffer.at (vta).m_pdu = m_txedBuffer.at (vta)->Copy ();
-          m_retxBuffer.at (vta).m_retxCount = 1;
-          m_retxBufferSize += m_retxBuffer.at (vta).m_pdu->GetSize ();
-
-          m_txedBufferSize -= m_txedBuffer.at (vta)->GetSize ();
-          m_txedBuffer.at (vta) = 0;
-
-          LteRlcAmHeader rlcAmHeader;
-          packet->PeekHeader (rlcAmHeader);
-          NS_LOG_LOGIC ("RLC header: " << rlcAmHeader);
-
-          // Send RLC PDU to MAC layer
-          LteMacSapProvider::TransmitPduParameters params;
-          params.pdu = packet;
-          params.rnti = m_rnti;
-          params.lcid = m_lcid;
-          params.layer = layer;
-          params.harqProcessId = harqId;
-
-          m_macSapProvider->TransmitPdu (params);
-          return;
-        }
-      else
+      NS_ASSERT (m_vtS <= m_vtMs);
+      if (m_vtS == m_vtMs)
         {
-          NS_LOG_LOGIC ("TxOpportunity (size = " << bytes << ") too small for retransmission of the packet (size = " << packet->GetSize () << ")");
-          NS_LOG_LOGIC ("Waiting for bigger TxOpportunity");
+          NS_LOG_INFO ("cannot transmit new RLC PDU due to window stalling");
           return;
         }
+
+      NS_LOG_LOGIC ("Sending data from Transmission Buffer");
     }
   else
     {
@@ -430,7 +527,7 @@
 
           // nextSegmentSize MUST be zero (only if segment is smaller or equal to 2047)
 
-          // (NO more segments) → exit
+          // (NO more segments) ? exit
           // break;
         }
       else if ( (nextSegmentSize - firstSegment->GetSize () <= 2) || (m_txonBuffer.size () == 0) )
@@ -461,7 +558,7 @@
 
           // nextSegmentSize <= 2 (only if txBuffer is not empty)
 
-          // (NO more segments) → exit
+          // (NO more segments) ? exit
           // break;
         }
       else // (firstSegment->GetSize () < m_nextSegmentSize) && (m_txBuffer.size () > 0)
@@ -508,6 +605,9 @@
   rlcAmHeader.SetLastSegmentFlag (LteRlcAmHeader::LAST_PDU_SEGMENT);
   rlcAmHeader.SetSegmentOffset (0);
 
+  NS_ASSERT_MSG(rlcAmHeader.GetSequenceNumber () < m_vtMs, "SN above TX window");
+  NS_ASSERT_MSG(rlcAmHeader.GetSequenceNumber () >= m_vtA, "SN below TX window");
+
   // Calculate FramingInfo flag according the status of the SDUs in the DataField
   uint8_t framingInfo = 0;
   std::vector< Ptr<Packet> >::iterator it;
@@ -564,10 +664,12 @@
   NS_LOG_LOGIC ("BYTE_WITHOUT_POLL = " << m_byteWithoutPoll);
 
   if ( (m_pduWithoutPoll >= m_pollPdu) || (m_byteWithoutPoll >= m_pollByte) ||
-       ( (m_txonBuffer.empty ()) && (m_retxBuffer.empty ()) ) ||
+       ( (m_txonBuffer.empty ()) && (m_retxBufferSize == 0) ) ||
        (m_vtS >= m_vtMs)
+       || m_pollRetransmitTimerJustExpired
      )
     {
+      m_pollRetransmitTimerJustExpired = false;
       rlcAmHeader.SetPollingBit (LteRlcAmHeader::STATUS_REPORT_IS_REQUESTED);
       m_pduWithoutPoll = 0;
       m_byteWithoutPoll = 0;
@@ -600,7 +702,8 @@
   // Store new PDU into the Transmitted PDU Buffer
   NS_LOG_LOGIC ("Put transmitted PDU in the txedBuffer");
   m_txedBufferSize += packet->GetSize ();
-  m_txedBuffer.at ( rlcAmHeader.GetSequenceNumber ().GetValue () ) = packet->Copy ();
+  m_txedBuffer.at ( rlcAmHeader.GetSequenceNumber ().GetValue () ).m_pdu = packet->Copy ();
+  m_txedBuffer.at ( rlcAmHeader.GetSequenceNumber ().GetValue () ).m_retxCount = 0;
 
   // Sender timestamp
   RlcTag rlcTag (Simulator::Now ());
@@ -624,6 +727,7 @@
   NS_LOG_FUNCTION (this);
 }
 
+
 void
 LteRlcAm::DoReceivePdu (Ptr<Packet> p)
 {
@@ -697,6 +801,7 @@
 
 
       SequenceNumber10 seqNumber = rlcAmHeader.GetSequenceNumber ();
+      seqNumber.SetModulusBase (m_vrR);
 
       if ( rlcAmHeader.GetResegmentationFlag () == LteRlcAmHeader::SEGMENT )
         {
@@ -751,12 +856,25 @@
         }
       else
         {
-          NS_LOG_LOGIC ("Place PDU in the reception buffer ( SN = " << seqNumber << " )");
-          m_rxonBuffer[ seqNumber.GetValue () ].m_byteSegments.push_back (p);
-          m_rxonBuffer[ seqNumber.GetValue () ].m_pduComplete = true;
-
           // - if some byte segments of the AMD PDU contained in the RLC data PDU have been received before:
           //         - discard the duplicate byte segments.
+          // note: re-segmentation of AMD PDU is currently not supported, 
+          // so we just check that the segment was not received before
+          std::map <uint16_t, PduBuffer>::iterator it = m_rxonBuffer.find (seqNumber.GetValue ());
+          if (it != m_rxonBuffer.end () )
+            {
+              NS_ASSERT (it->second.m_byteSegments.size () > 0);
+              NS_ASSERT_MSG (it->second.m_byteSegments.size () == 1, "re-segmentation not supported");
+              NS_LOG_LOGIC ("PDU segment already received, discarded");
+            }
+          else
+            {
+              NS_LOG_LOGIC ("Place PDU in the reception buffer ( SN = " << seqNumber << " )");
+              m_rxonBuffer[ seqNumber.GetValue () ].m_byteSegments.push_back (p);
+              m_rxonBuffer[ seqNumber.GetValue () ].m_pduComplete = true;
+            }
+
+
         }
 
       // 5.1.3.2.3 Actions when a RLC data PDU is placed in the reception buffer
@@ -778,11 +896,11 @@
 
       std::map <uint16_t, PduBuffer>::iterator it = m_rxonBuffer.find (m_vrMs.GetValue ());
       if ( it != m_rxonBuffer.end () &&
-           m_rxonBuffer[ m_vrMs.GetValue () ].m_pduComplete )
+           it->second.m_pduComplete )
         {
           int firstVrMs = m_vrMs.GetValue ();
           while ( it != m_rxonBuffer.end () &&
-                  m_rxonBuffer[ m_vrMs.GetValue () ].m_pduComplete )
+                  it->second.m_pduComplete )
             {
               m_vrMs++;
               it = m_rxonBuffer.find (m_vrMs.GetValue ());
@@ -803,34 +921,34 @@
         {
           std::map <uint16_t, PduBuffer>::iterator it = m_rxonBuffer.find (seqNumber.GetValue ());
           if ( it != m_rxonBuffer.end () &&
-               m_rxonBuffer[ seqNumber.GetValue () ].m_pduComplete )
+               it->second.m_pduComplete )
             {
               it = m_rxonBuffer.find (m_vrR.GetValue ());
               int firstVrR = m_vrR.GetValue ();
               while ( it != m_rxonBuffer.end () &&
-                      m_rxonBuffer[ m_vrR.GetValue () ].m_pduComplete )
+                      it->second.m_pduComplete )
                 {
                   NS_LOG_LOGIC ("Reassemble and Deliver ( SN = " << m_vrR << " )");
-                  NS_ASSERT_MSG (m_rxonBuffer[ m_vrR.GetValue () ].m_byteSegments.size () == 1,
+                  NS_ASSERT_MSG (it->second.m_byteSegments.size () == 1,
                                 "Too many segments. PDU Reassembly process didn't work");
-                  ReassembleAndDeliver (m_rxonBuffer[ m_vrR.GetValue () ].m_byteSegments.front ());
+                  ReassembleAndDeliver (it->second.m_byteSegments.front ());
                   m_rxonBuffer.erase (m_vrR.GetValue ());
 
                   m_vrR++;
+                  m_vrR.SetModulusBase (m_vrR);
+                  m_vrX.SetModulusBase (m_vrR);
+                  m_vrMs.SetModulusBase (m_vrR);
+                  m_vrH.SetModulusBase (m_vrR);
                   it = m_rxonBuffer.find (m_vrR.GetValue ());
 
                   NS_ASSERT_MSG (firstVrR != m_vrR.GetValue (), "Infinite loop in RxonBuffer");
                 }
               NS_LOG_LOGIC ("New VR(R)  = " << m_vrR);
               m_vrMr = m_vrR + m_windowSize;
+
               NS_LOG_LOGIC ("New VR(MR) = " << m_vrMr);
             }
 
-//           NS_LOG_LOGIC ("Reassemble and Deliver ( SN = " << seqNumber << " )");
-//           NS_ASSERT_MSG (m_rxonBuffer[ seqNumber.GetValue () ].m_byteSegments.size () == 1,
-//                          "Too many segments. PDU Reassembly process didn't work");
-//           ReassembleAndDeliver (m_rxonBuffer[ seqNumber.GetValue () ].m_byteSegments.front ());
-//           m_rxonBuffer.erase (seqNumber.GetValue ());
         }
 
       // - if t-Reordering is running:
@@ -862,185 +980,109 @@
           if ( m_vrH > m_vrR )
             {
               NS_LOG_LOGIC ("Start reordering timer");
-              m_reorderingTimer = Simulator::Schedule (Time ("0.1s"),
+              m_reorderingTimer = Simulator::Schedule (m_reorderingTimerValue,
                                                        &LteRlcAm::ExpireReorderingTimer ,this);
               m_vrX = m_vrH;
               NS_LOG_LOGIC ("New VR(X) = " << m_vrX);
             }
         }
-
-
-
-      /// \todo To remove
-
-      // 5.1.2.2.3 Actions when an UMD PDU is placed in the reception buffer
-      // When an UMD PDU with SN = x is placed in the reception buffer, the receiving UM RLC entity shall:
-
-      // - if x falls outside of the reordering window:
-      //    - update VR(UH) to x + 1;
-      //    - reassemble RLC SDUs from any UMD PDUs with SN that falls outside of the reordering window, remove
-      //      RLC headers when doing so and deliver the reassembled RLC SDUs to upper layer in ascending order of the
-      //      RLC SN if not delivered before;
-      //    - if VR(UR) falls outside of the reordering window:
-      //        - set VR(UR) to (VR(UH) - UM_Window_Size);
-
-//       if ( ! IsInsideReorderingWindow (seqNumber))
-//         {
-//           NS_LOG_LOGIC ("SN outside the reordering window");
-// 
-//           m_vrUh = seqNumber + 1;
-//           NS_LOG_LOGIC ("New VR(UH) = " << m_vrUh);
-// 
-//           ReassembleOutsideWindow ();
-// 
-//           if ( ! IsInsideReorderingWindow (m_vrUr) )
-//             {
-//               m_vrUr = m_vrUh - m_windowSize;
-//               NS_LOG_LOGIC ("VR(UR) outside the reordering window");
-//               NS_LOG_LOGIC ("New VR(UR) = " << m_vrUr);
-//             }
-//         }
-
-      // - if the reception buffer contains an UMD PDU with SN = VR(UR):
-      //    - update VR(UR) to the SN of the first UMD PDU with SN > current VR(UR) that has not been received;
-      //    - reassemble RLC SDUs from any UMD PDUs with SN < updated VR(UR), remove RLC headers when doing
-      //      so and deliver the reassembled RLC SDUs to upper layer in ascending order of the RLC SN if not delivered
-      //      before;
-
-//       if ( m_rxBuffer.count (m_vrUr) > 0 )
-//         {
-//           NS_LOG_LOGIC ("Reception buffer contains SN = " << m_vrUr);
-// 
-//           std::map <uint16_t, Ptr<Packet> >::iterator it;
-//           uint16_t newVrUr;
-// 
-//           it = m_rxBuffer.find (m_vrUr);
-//           newVrUr = (it->first) + 1;
-//           while ( m_rxBuffer.count (newVrUr) > 0 )
-//             {
-//               newVrUr++;
-//             }
-//           m_vrUr = newVrUr;
-//           NS_LOG_LOGIC ("New VR(UR) = " << m_vrUr);
-// 
-//           ReassembleSnLessThan (m_vrUr);
-//         }
-
-      // - if t-Reordering is running:
-      //    - if VR(UX) <= VR(UR); or
-      //    - if VR(UX) falls outside of the reordering window and VR(UX) is not equal to VR(UH)::
-      //        - stop and reset t-Reordering;
-//       if ( m_reorderingTimer.IsRunning () )
-//         {
-//           NS_LOG_LOGIC ("Reordering timer is running");
-// 
-//           if ( (m_vrUx <= m_vrUr) ||
-//               ((! IsInsideReorderingWindow (m_vrUx)) && (m_vrUx != m_vrUh)) )
-//             {
-//               NS_LOG_LOGIC ("Stop reordering timer");
-//               m_reorderingTimer.Cancel ();
-//             }
-//         }
-
-      // - if t-Reordering is not running (includes the case when t-Reordering is stopped due to actions above):
-      //    - if VR(UH) > VR(UR):
-      //        - start t-Reordering;
-      //        - set VR(UX) to VR(UH).
-//       if ( ! m_reorderingTimer.IsRunning () )
-//         {
-//           NS_LOG_LOGIC ("Reordering timer is not running");
-// 
-//           if ( m_vrUx > m_vrUr )
-//             {
-//               NS_LOG_LOGIC ("VR(UX) > VR(UR). " << m_vrUx << " > " << m_vrUr);
-//               NS_LOG_LOGIC ("Start reordering timer");
-//               m_reorderingTimer = Simulator::Schedule (Time ("1.0s"),
-//                                                       &LteRlcAm::ExpireReorderingTimer ,this);
-//               m_vrUx = m_vrUh;
-//               NS_LOG_LOGIC ("New VR(UX) = " << m_vrUx);
-//             }
-//         }
-
     }
   else if ( rlcAmHeader.IsControlPdu () )
     {
       NS_LOG_INFO ("Control AM RLC PDU");
 
       SequenceNumber10 ackSn = rlcAmHeader.GetAckSn ();
-//       SequenceNumber10 seqNumber = m_vtA;
+      SequenceNumber10 sn;
 
       NS_LOG_INFO ("ackSn     = " << ackSn);
       NS_LOG_INFO ("VT(A)     = " << m_vtA);
       NS_LOG_INFO ("VT(S)     = " << m_vtS);
+      NS_LOG_LOGIC ("retxBufferSize = " << m_retxBufferSize);
+      NS_LOG_LOGIC ("txedBufferSize = " << m_txedBufferSize);
 
       m_vtA.SetModulusBase (m_vtA);
       m_vtS.SetModulusBase (m_vtA);
+      m_vtMs.SetModulusBase (m_vtA);
       ackSn.SetModulusBase (m_vtA);
-      while (m_vtA < ackSn && m_vtA < m_vtS)
+      sn.SetModulusBase (m_vtA);
+
+      bool incrementVtA = true; 
+
+      for (sn = m_vtA; sn < ackSn && sn < m_vtS; sn++)
         {
-//           NS_LOG_INFO ("seqNumber = " << seqNumber);
-//           NS_LOG_INFO ("m_txedBuffer( VT(A) ).size = " << m_txedBuffer.size ());
+          NS_LOG_LOGIC ("sn = " << sn);
+
+          uint16_t seqNumberValue = sn.GetValue ();
 
-          uint16_t seqNumberValue = m_vtA.GetValue ();
           if (m_pollRetransmitTimer.IsRunning () 
               && (seqNumberValue == m_pollSn.GetValue ()))
             {
               m_pollRetransmitTimer.Cancel ();
             }
 
-          if (m_txedBuffer.at (seqNumberValue))
-            {
-              NS_LOG_INFO ("ACKed SN = " << seqNumberValue << " from txedBuffer");
-//               NS_LOG_INFO ("m_txedBuffer( " << m_vtA << " )->GetSize = " << m_txedBuffer.at (m_vtA.GetValue ())->GetSize ());
-              m_txedBufferSize -= m_txedBuffer.at (seqNumberValue)->GetSize ();
-              m_txedBuffer.at (seqNumberValue) = 0;
-            }
-
-          if (m_retxBuffer.at (seqNumberValue).m_pdu)
+          if (rlcAmHeader.IsNackPresent (sn))
             {
-              NS_LOG_INFO ("ACKed SN = " << seqNumberValue << " from retxBuffer");
-              m_retxBufferSize -= m_retxBuffer.at (seqNumberValue).m_pdu->GetSize ();
-              m_retxBuffer.at (seqNumberValue).m_pdu = 0;
-              m_retxBuffer.at (seqNumberValue).m_retxCount = 0;
-            }
+              NS_LOG_LOGIC ("sn " << sn << " is NACKed");
 
-          m_vtA++;
-          m_vtA.SetModulusBase (m_vtA);
-          m_vtS.SetModulusBase (m_vtA);
-          ackSn.SetModulusBase (m_vtA);
-        }
+              incrementVtA = false;
 
-      NS_LOG_INFO ("New VT(A) = " << m_vtA);
-
-      SequenceNumber10 seqNumber = m_vtA;
-      uint16_t seqNumberValue;
-      while (seqNumber < m_vtS)
-        {
-          seqNumberValue = seqNumber.GetValue ();
-          if (m_txedBuffer.at (seqNumberValue))
-            {
-              NS_LOG_INFO ("Move SN = " << seqNumberValue << " to retxBuffer");
-              m_retxBuffer.at (seqNumberValue).m_pdu = m_txedBuffer.at (seqNumberValue)->Copy ();
-              m_retxBuffer.at (seqNumberValue).m_retxCount = 0;
-              m_retxBufferSize += m_retxBuffer.at (seqNumberValue).m_pdu->GetSize ();
+              if (m_txedBuffer.at (seqNumberValue).m_pdu != 0)
+                {
+                  NS_LOG_INFO ("Move SN = " << seqNumberValue << " to retxBuffer");
+                  m_retxBuffer.at (seqNumberValue).m_pdu = m_txedBuffer.at (seqNumberValue).m_pdu->Copy ();
+                  m_retxBuffer.at (seqNumberValue).m_retxCount = m_txedBuffer.at (seqNumberValue).m_retxCount;
+                  m_retxBufferSize += m_retxBuffer.at (seqNumberValue).m_pdu->GetSize ();
+
+                  m_txedBufferSize -= m_txedBuffer.at (seqNumberValue).m_pdu->GetSize ();
+                  m_txedBuffer.at (seqNumberValue).m_pdu = 0;
+                  m_txedBuffer.at (seqNumberValue).m_retxCount = 0;
+                }
 
-              m_txedBufferSize -= m_txedBuffer.at (seqNumberValue)->GetSize ();
-              m_txedBuffer.at (seqNumberValue) = 0;
+              NS_ASSERT (m_retxBuffer.at (seqNumberValue).m_pdu != 0);
+              
             }
-          else if (m_retxBuffer.at (seqNumberValue).m_pdu)
+          else
             {
-              m_retxBuffer.at (seqNumberValue).m_retxCount++;
-              NS_LOG_INFO ("Incr RETX_COUNT for SN = " << seqNumberValue);
-              if (m_retxBuffer.at (seqNumberValue).m_retxCount >= m_maxRetxThreshold)
+              NS_LOG_LOGIC ("sn " << sn << " is ACKed");
+
+              if (m_txedBuffer.at (seqNumberValue).m_pdu)
+                {
+                  NS_LOG_INFO ("ACKed SN = " << seqNumberValue << " from txedBuffer");
+                  //               NS_LOG_INFO ("m_txedBuffer( " << m_vtA << " )->GetSize = " << m_txedBuffer.at (m_vtA.GetValue ())->GetSize ());
+                  m_txedBufferSize -= m_txedBuffer.at (seqNumberValue).m_pdu->GetSize ();
+                  m_txedBuffer.at (seqNumberValue).m_pdu = 0;
+                  NS_ASSERT (m_retxBuffer.at (seqNumberValue).m_pdu == 0);
+                }
+
+              if (m_retxBuffer.at (seqNumberValue).m_pdu)
                 {
-                  NS_LOG_INFO ("Max RETX_COUNT for SN = " << seqNumberValue);
+                  NS_LOG_INFO ("ACKed SN = " << seqNumberValue << " from retxBuffer");
+                  m_retxBufferSize -= m_retxBuffer.at (seqNumberValue).m_pdu->GetSize ();
+                  m_retxBuffer.at (seqNumberValue).m_pdu = 0;
+                  m_retxBuffer.at (seqNumberValue).m_retxCount = 0;
                 }
+
             }
 
-          seqNumber++;
-        }
+          NS_LOG_LOGIC ("retxBufferSize = " << m_retxBufferSize);
+          NS_LOG_LOGIC ("txedBufferSize = " << m_txedBufferSize);      
 
+          if (incrementVtA)
+            {
+              m_vtA++;
+              m_vtMs = m_vtA + m_windowSize;
+              NS_LOG_INFO ("New VT(A) = " << m_vtA);
+              m_vtA.SetModulusBase (m_vtA);
+              m_vtMs.SetModulusBase (m_vtA);
+              m_vtS.SetModulusBase (m_vtA);
+              ackSn.SetModulusBase (m_vtA);
+              sn.SetModulusBase (m_vtA);
+            }
+          
+        } // loop over SN : VT(A) <= SN < ACK SN
+      
       return;
+
     }
   else
     {
@@ -1493,59 +1535,6 @@
 
 }
 
-
-/// \todo To remove
-// void
-// LteRlcAm::ReassembleOutsideWindow (void)
-// {
-//   NS_LOG_LOGIC ("Reassemble Outside Window");
-// 
-//   std::map <uint16_t, Ptr<Packet> >::iterator it;
-//   it = m_rxBuffer.begin ();
-// 
-//   while ( (it != m_rxBuffer.end ()) && ! IsInsideReorderingWindow (it->first) )
-//     {
-//       NS_LOG_LOGIC ("SN = " << it->first);
-// 
-//       // Reassemble RLC SDUs and deliver the PDCP PDU to upper layer
-//       ReassembleAndDeliver (it->second);
-//       m_rxBuffer.erase (it);
-//       it++;
-//     }
-// 
-//   if (it != m_rxBuffer.end ())
-//     {
-//       NS_LOG_LOGIC ("(SN = " << it->first << ") is inside the reordering window");
-//     }
-// }
-
-
-/// \todo To remove
-// void
-// LteRlcAm::ReassembleSnLessThan (uint16_t seqNumber)
-// {
-//   NS_LOG_LOGIC ("Reassemble SN < updated VR(UR)" );
-// 
-//   std::map <uint16_t, Ptr<Packet> >::iterator it;
-//   it = m_rxBuffer.begin ();
-// 
-//   while ( (it != m_rxBuffer.end ()) && (it->first < seqNumber) )
-//     {
-//       NS_LOG_LOGIC ("SN = " << it->first);
-// 
-//       // Reassemble RLC SDUs and deliver the PDCP PDU to upper layer
-//       ReassembleAndDeliver (it->second);
-//       m_rxBuffer.erase (it);
-//       it++;
-//     }
-// 
-//   if (it != m_rxBuffer.end ())
-//     {
-//       NS_LOG_LOGIC ("(SN = " << it->first << ") >= " << m_vrUr);
-//     }
-// }
-
-
 void
 LteRlcAm::DoReportBufferStatus (void)
 {
@@ -1569,17 +1558,23 @@
     }
 
   // Retransmission Queue HOL time
-  Time retxQueueHolDelay (0);
+  Time retxQueueHolDelay;
   RlcTag retxQueueHolTimeTag;
   if ( m_retxBufferSize > 0 )
     {
-      m_retxBuffer.at (m_vtA.GetValue ()).m_pdu->PeekPacketTag (retxQueueHolTimeTag);
+      if (m_retxBuffer.at (m_vtA.GetValue ()).m_pdu != 0)
+        {
+          m_retxBuffer.at (m_vtA.GetValue ()).m_pdu->PeekPacketTag (retxQueueHolTimeTag);
+        }
+      else
+        {
+          m_txedBuffer.at (m_vtA.GetValue ()).m_pdu->PeekPacketTag (retxQueueHolTimeTag);
+        }      
       retxQueueHolDelay = now - retxQueueHolTimeTag.GetSenderTimestamp ();
     }
-  else if ( m_txedBufferSize > 0 )
-    {
-      m_txedBuffer.at (m_vtA.GetValue ())->PeekPacketTag (retxQueueHolTimeTag);
-      retxQueueHolDelay = now - retxQueueHolTimeTag.GetSenderTimestamp ();
+  else 
+    {      
+      retxQueueHolDelay = Seconds (0);
     }
 
   LteMacSapProvider::ReportBufferStatusParameters r;
@@ -1631,7 +1626,7 @@
   int firstVrMs = m_vrMs.GetValue ();
   std::map <uint16_t, PduBuffer>::iterator it = m_rxonBuffer.find (m_vrMs.GetValue ());
   while ( it != m_rxonBuffer.end () &&
-          m_rxonBuffer[ m_vrMs.GetValue () ].m_pduComplete )
+          it->second.m_pduComplete )
     {
       m_vrMs++;
       it = m_rxonBuffer.find (m_vrMs.GetValue ());
@@ -1643,11 +1638,16 @@
   if ( m_vrH > m_vrMs )
     {
       NS_LOG_LOGIC ("Start reordering timer");
-      m_reorderingTimer = Simulator::Schedule (Time ("0.1s"),
+      m_reorderingTimer = Simulator::Schedule (m_reorderingTimerValue,
                                               &LteRlcAm::ExpireReorderingTimer ,this);
       m_vrX = m_vrH;
       NS_LOG_LOGIC ("New VR(MS) = " << m_vrMs);
     }
+
+    // Section 5.2.3 Status Reporting:
+    //   - The receiving side of an AM RLC entity shall trigger a
+    //     STATUS report when T_reordering expires. 
+  m_statusPduRequested = true;
 }
 
 void
@@ -1661,9 +1661,54 @@
   NS_LOG_LOGIC ("txedBufferSize = " << m_txedBufferSize);
   NS_LOG_LOGIC ("statusPduRequested = " << m_statusPduRequested);
 
-  DoReportBufferStatus ();
+  m_pollRetransmitTimerJustExpired = true;
+
+  // see section 5.2.2.3
+  // note the difference between Rel 8 and Rel 11 specs; we follow Rel 11 here
+  NS_ASSERT (m_vtS <= m_vtMs);
+  if ((m_txonBufferSize == 0 && m_retxBufferSize == 0)
+      || (m_vtS == m_vtMs))
+    {
+      NS_LOG_INFO ("txonBuffer and retxBuffer empty. Move PDUs up to = " << m_vtS.GetValue () - 1 << " to retxBuffer");
+      uint16_t sn = 0;
+      for ( sn = m_vtA.GetValue(); sn < m_vtS.GetValue (); sn++ )
+        {
+          bool pduAvailable = m_txedBuffer.at (sn).m_pdu != 0;
+
+           if ( pduAvailable )
+             {
+               NS_LOG_INFO ("Move PDU " << sn << " from txedBuffer to retxBuffer");
+               m_retxBuffer.at (sn).m_pdu = m_txedBuffer.at (sn).m_pdu->Copy ();
+               m_retxBuffer.at (sn).m_retxCount = m_txedBuffer.at (sn).m_retxCount;
+               m_retxBufferSize += m_retxBuffer.at (sn).m_pdu->GetSize ();
+
+               m_txedBufferSize -= m_txedBuffer.at (sn).m_pdu->GetSize ();
+               m_txedBuffer.at (sn).m_pdu = 0;
+               m_txedBuffer.at (sn).m_retxCount = 0;
+             }
+        }
+    }
+
+  DoReportBufferStatus ();  
 }
 
 
+void 
+LteRlcAm::ExpireStatusProhibitTimer (void)
+{
+  NS_LOG_FUNCTION (this);
+}
+
+void
+LteRlcAm::ExpireRbsTimer (void)
+{
+  NS_LOG_LOGIC ("RBS Timer expires");
+
+  if (m_txonBufferSize + m_txedBufferSize + m_retxBufferSize > 0)
+    {
+      DoReportBufferStatus ();
+      m_rbsTimer = Simulator::Schedule (m_rbsTimerValue, &LteRlcAm::ExpireRbsTimer, this);
+    }
+}
 
 } // namespace ns3
diff -Naur ns-3.22/src/lte/model/lte-rlc-am.h ns-3.23/src/lte/model/lte-rlc-am.h
--- ns-3.22/src/lte/model/lte-rlc-am.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-am.h	2015-05-13 11:05:26.000000000 -0700
@@ -61,6 +61,13 @@
    */
   void ExpireReorderingTimer (void);
   void ExpirePollRetransmitTimer (void);
+  void ExpireRbsTimer (void);
+
+  /** 
+   * method called when the T_status_prohibit timer expires
+   * 
+   */
+  void ExpireStatusProhibitTimer (void);
 
   bool IsInsideReceivingWindow (SequenceNumber10 seqNumber);
 // 
@@ -73,15 +80,17 @@
 
 private:
     std::vector < Ptr<Packet> > m_txonBuffer;       // Transmission buffer
-    std::vector < Ptr<Packet> > m_txedBuffer;       // Transmitted packets buffer
 
-    struct RetxBuffer
+    struct RetxPdu
     {
       Ptr<Packet> m_pdu;
       uint16_t    m_retxCount;
     };
 
-    std::vector < RetxBuffer > m_retxBuffer;       // Retransmission buffer
+  std::vector <RetxPdu> m_txedBuffer;  ///< Buffer for transmitted and retransmitted PDUs 
+                                       ///< that have not been acked but are not considered 
+                                       ///< for retransmission 
+  std::vector <RetxPdu> m_retxBuffer;  ///< Buffer for PDUs considered for retransmission
 
     uint32_t m_txonBufferSize;
     uint32_t m_retxBufferSize;
@@ -96,8 +105,6 @@
       std::list < Ptr<Packet> >  m_byteSegments;
 
       bool      m_pduComplete;
-      uint16_t  m_totalSize;
-      uint16_t  m_currSize;
     };
 
     std::map <uint16_t, PduBuffer > m_rxonBuffer; // Reception buffer
@@ -142,7 +149,11 @@
   EventId m_pollRetransmitTimer;
   Time    m_pollRetransmitTimerValue;
   EventId m_reorderingTimer;
+  Time    m_reorderingTimerValue;
   EventId m_statusProhibitTimer;
+  Time    m_statusProhibitTimerValue;
+  EventId m_rbsTimer;
+  Time    m_rbsTimerValue;
 
   /**
    * Configurable parameters. See section 7.4 in TS 36.322
@@ -152,6 +163,7 @@
   uint16_t m_pollByte;
   
   bool m_txOpportunityForRetxAlwaysBigEnough;
+  bool m_pollRetransmitTimerJustExpired;
 
   /**
    * SDU Reassembling state
diff -Naur ns-3.22/src/lte/model/lte-rlc-am-header.cc ns-3.23/src/lte/model/lte-rlc-am-header.cc
--- ns-3.22/src/lte/model/lte-rlc-am-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-am-header.cc	2015-05-13 11:05:26.000000000 -0700
@@ -38,8 +38,7 @@
     m_segmentOffset (0xffff),
     m_lastOffset (0xffff),
     m_controlPduType (0xff),
-    m_ackSn (0xffff),
-    m_nackSn (0xffff)
+    m_ackSn (0xffff)
 {
 }
 
@@ -55,7 +54,6 @@
     m_lastOffset = 0xffff;
     m_controlPduType = 0xff;
     m_ackSn = 0xffff;
-    m_nackSn = 0xffff;
 }
 
 void
@@ -214,6 +212,76 @@
   m_ackSn = ackSn;
 }
 
+bool
+LteRlcAmHeader::OneMoreNackWouldFitIn (uint16_t bytes)
+{
+  NS_LOG_FUNCTION (this << bytes);
+  NS_ASSERT_MSG (m_dataControlBit == CONTROL_PDU && m_controlPduType == LteRlcAmHeader::STATUS_PDU,
+                 "method allowed only for STATUS PDUs");
+  if (m_nackSnList.size () % 2 == 0)
+    {
+      return (m_headerLength < bytes);
+    }
+  else
+    {
+      return (m_headerLength < (bytes - 1));
+    }
+}
+
+void
+LteRlcAmHeader::PushNack (int nack)
+{
+  NS_LOG_FUNCTION (this << nack);
+  NS_ASSERT_MSG (m_dataControlBit == CONTROL_PDU && m_controlPduType == LteRlcAmHeader::STATUS_PDU,
+                 "method allowed only for STATUS PDUs");
+  m_nackSnList.push_back (nack);
+
+  if (m_nackSnList.size () % 2 == 0)
+    {
+      m_headerLength++;
+    }
+  else
+    {
+      m_headerLength+=2;
+    }
+}
+
+bool
+LteRlcAmHeader::IsNackPresent (SequenceNumber10 nack)
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG (m_dataControlBit == CONTROL_PDU && m_controlPduType == LteRlcAmHeader::STATUS_PDU,
+                 "method allowed only for STATUS PDUs");
+  for (std::list<int>::iterator nackIt = m_nackSnList.begin ();
+       nackIt != m_nackSnList.end ();
+       ++nackIt)
+    {
+      if ((*nackIt) == nack.GetValue ())
+        {
+          return true;
+        }
+    }
+  return false;  
+}
+
+int
+LteRlcAmHeader::PopNack (void)
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG (m_dataControlBit == CONTROL_PDU && m_controlPduType == LteRlcAmHeader::STATUS_PDU,
+                 "method allowed only for STATUS PDUs");
+  if ( m_nackSnList.empty () )
+    {
+      return -1;
+    }
+
+  int nack = m_nackSnList.front ();
+  m_nackSnList.pop_front ();
+
+  return nack;
+}
+
+
 SequenceNumber10
 LteRlcAmHeader::GetAckSn (void) const
 {
@@ -226,6 +294,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteRlcAmHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteRlcAmHeader> ()
   ;
   return tid;
@@ -242,6 +311,7 @@
 {
   std::list <uint8_t>::const_iterator it1 = m_extensionBits.begin ();
   std::list <uint16_t>::const_iterator it2 = m_lengthIndicators.begin ();
+  std::list <int>::const_iterator it3 = m_nackSnList.begin ();
 
   os << "Len=" << m_headerLength;
   os << " D/C=" << (uint16_t)m_dataControlBit;
@@ -280,7 +350,14 @@
   else // if ( m_dataControlBit == CONTROL_PDU )
     {
       os << " ACK_SN=" << m_ackSn;
-      os << " NACK_SN=" << m_nackSn;
+
+       while ( it3 != m_nackSnList.end () )
+        {
+          os << " NACK_SN=" << (int)(*it3);
+          it3++;
+        }
+
+ 
     }
 }
 
@@ -295,6 +372,7 @@
 
   std::list <uint8_t>::const_iterator it1 = m_extensionBits.begin ();
   std::list <uint16_t>::const_iterator it2 = m_lengthIndicators.begin ();
+  std::list <int>::const_iterator it3 = m_nackSnList.begin ();
 
   if ( m_dataControlBit == DATA_PDU )
     {
@@ -347,7 +425,77 @@
       i.WriteU8 ( ((CONTROL_PDU << 7) & 0x80) |
                   ((m_controlPduType << 4) & 0x70) |
                   ((m_ackSn.GetValue () >> 6) & 0x0F) );
-      i.WriteU8 ( ((m_ackSn.GetValue () << 2) & 0xFC) );
+      // note: second part of ackSn will be written later
+
+      // serialize the NACKs
+      if ( it3 == m_nackSnList.end () ) 
+        {
+          NS_LOG_LOGIC (this << " no NACKs");
+           // If there are no NACKs then this line adds the rest of the ACK
+           // along with 0x00, indicating an E1 value of 0 or no NACKs follow.
+           i.WriteU8 ( ((m_ackSn.GetValue () << 2) & 0xFC) );
+        }
+      else
+        {
+          int oddNack = *it3;
+          int evenNack = -1;
+          // Else write out a series of E1 = 1 and NACK values. Note since we
+          // are not supporting SO start/end the value of E2 will always be 0.
+
+
+          // First write out the ACK along with the very first NACK
+          // And the remaining NACK with 0x02 or 10 in binary to set
+          // E1 to 1, then Or in the first bit of the NACK
+          i.WriteU8 ( ((m_ackSn.GetValue () << 2) & 0xFC)
+            | (0x02)
+            | ((*it3 >> 9) & 0x01));
+
+          while ( it3 != m_nackSnList.end () )
+            {
+              // The variable oddNack has the current NACK value to write, also
+              // either the setup to enter this loop or the previous loop would
+              // have written the highest order bit to the previouse octet.
+              // Write the next set of bits (2 - 9) into the next octet
+              i.WriteU8( ((oddNack >> 1) & 0xFF) );
+
+              // Next check to see if there is going to be another NACK after
+              // this
+              it3++;
+              if ( it3 != m_nackSnList.end () )
+                {
+                  // Yes there will be another NACK after this, so E1 will be 1
+                  evenNack = *it3;
+                  i.WriteU8( ((oddNack << 7) & 0x80)
+                   | (0x40)  // E1 = 1 E2 = 0, more NACKs
+                   | ( (evenNack >> 5) & 0x1F) );
+
+                  // The final octet of this loop will have the rest of the
+                  // NACK and another E1, E2. Check to see if there will be
+                  // one more NACK after this.
+                  it3++;
+                  if ( it3 != m_nackSnList.end () )
+                    {
+                      // Yes there is at least one more NACK. Finish writing
+                      // this octet and the next iteration will do the rest.
+                      oddNack = *it3;
+                      i.WriteU8 ( ((evenNack << 3) & 0xF8)
+                        | (0x04)
+                        | ((oddNack >> 9) & 0x01));
+                    }
+                  else
+                    {
+                      // No, there are no more NACKs
+                      i.WriteU8 ( ((evenNack << 3) & 0xF8) );
+                    }
+                }
+              else
+                {
+                  // No, this is the last NACK so E1 will be 0
+                  i.WriteU8 ( ((oddNack << 7) & 0x80) );
+                }
+            }
+        }
+
     }
 }
 
@@ -431,7 +579,65 @@
       m_controlPduType = (byte_1 & 0x70) >> 4;
       m_ackSn = ((byte_1 & 0x0F) << 6 ) | ((byte_2 & 0xFC) >> 2);
 
-      m_headerLength++;
+      int moreNacks = (byte_2 & 0x02) >> 1;
+      // Get the first NACK outside the loop as it is not preceded by an E2
+      // field but all following NACKs will.
+      if ( moreNacks == 1 )
+        {
+          byte_3 = i.ReadU8 ();
+          byte_4 = i.ReadU8 ();
+          m_headerLength = 4;
+
+          m_nackSnList.push_back (
+            ((byte_2 & 0x01) << 9)
+            | (byte_3 << 1)
+            | ((byte_4 & 0x80) >> 7)
+          );
+
+         // Loop until all NACKs are found
+         moreNacks = ((byte_4 & 0x40) >> 6);
+         uint8_t byte = byte_4;
+         uint8_t nextByte;
+         uint8_t finalByte;
+         while (moreNacks == 1)
+           {
+             // Ignore E2, read next NACK
+             nextByte = i.ReadU8 ();
+             m_nackSnList.push_back (
+              ((byte & 0x1F) << 5)
+              | ((nextByte & 0xF8) >> 3)
+            );
+
+            // Check for another NACK, after this any following NACKs will
+            // be aligned properly for the next iteration of this loop.
+            moreNacks = (nextByte & 0x04) >> 2;
+            byte = nextByte;
+            if (moreNacks == 1)
+              {
+                nextByte = i.ReadU8 ();
+                finalByte = i.ReadU8 ();
+
+                 m_nackSnList.push_back (
+                   ((byte & 0x01) << 9)
+                   | (nextByte << 1)
+                   | ((finalByte & 0x80) >> 7)
+                 );
+
+                moreNacks = ((finalByte & 0x40) >> 6);
+                byte = finalByte;
+                m_headerLength+=3;
+              }
+            else
+              {
+                m_headerLength++;
+              }
+
+           }
+        }
+      else
+        {
+          m_headerLength++;
+        }
     }
 
   return GetSerializedSize ();
diff -Naur ns-3.22/src/lte/model/lte-rlc-am-header.h ns-3.23/src/lte/model/lte-rlc-am-header.h
--- ns-3.22/src/lte/model/lte-rlc-am-header.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-am-header.h	2015-05-13 11:05:26.000000000 -0700
@@ -136,6 +136,41 @@
   virtual void Serialize (Buffer::Iterator start) const;
   virtual uint32_t Deserialize (Buffer::Iterator start);
 
+  /** 
+   * 
+   * 
+   * \param bytes max allowed CONTROL PDU size
+   * 
+   * \return true if one more NACK would fit in the CONTROL PDU; false otherwise
+   */
+  bool OneMoreNackWouldFitIn (uint16_t bytes);
+
+  /** 
+   * Add one more NACK to the CONTROL PDU
+   * 
+   * \param nack 
+   */
+  void PushNack (int nack);
+
+  /** 
+   * 
+   * 
+   * \param nack SN of the NACK
+   * 
+   * \return true if the NACK is present in the STATUS PDU, false otherwise
+   */
+  bool IsNackPresent (SequenceNumber10 nack);
+
+
+  /** 
+   * Retrieve one NACK from the CONTROL PDU
+   * 
+   * 
+   * \return the SN  >= 0 of the next nack; returns -1 if no NACK is left
+   */
+  int PopNack (void);
+
+
 private:
   uint16_t m_headerLength;
   uint8_t  m_dataControlBit;
@@ -157,7 +192,7 @@
 
   // Status PDU fields
   SequenceNumber10 m_ackSn;
-  SequenceNumber10 m_nackSn;
+  std::list <int> m_nackSnList;
 
   std::list <uint8_t> m_extensionBits1; // Includes E1 after ACK_SN
   std::list <uint8_t> m_extensionBits2;
diff -Naur ns-3.22/src/lte/model/lte-rlc.cc ns-3.23/src/lte/model/lte-rlc.cc
--- ns-3.22/src/lte/model/lte-rlc.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc.cc	2015-05-13 11:05:26.000000000 -0700
@@ -102,6 +102,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteRlc")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddTraceSource ("TxPDU",
                      "PDU transmission notified to the MAC.",
                      MakeTraceSourceAccessor (&LteRlc::m_txPdu),
@@ -185,6 +186,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteRlcSm")
     .SetParent<LteRlc> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteRlcSm> ()
     ;
   return tid;
diff -Naur ns-3.22/src/lte/model/lte-rlc-header.cc ns-3.23/src/lte/model/lte-rlc-header.cc
--- ns-3.22/src/lte/model/lte-rlc-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-header.cc	2015-05-13 11:05:26.000000000 -0700
@@ -116,6 +116,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteRlcHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteRlcHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/lte-rlc-sdu-status-tag.cc ns-3.23/src/lte/model/lte-rlc-sdu-status-tag.cc
--- ns-3.22/src/lte/model/lte-rlc-sdu-status-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-sdu-status-tag.cc	2015-05-13 11:05:26.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteRlcSduStatusTag")
     .SetParent<Tag> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteRlcSduStatusTag> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/lte-rlc-sequence-number.h ns-3.23/src/lte/model/lte-rlc-sequence-number.h
--- ns-3.22/src/lte/model/lte-rlc-sequence-number.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-sequence-number.h	2015-05-13 11:05:26.000000000 -0700
@@ -79,6 +79,7 @@
   {
     SequenceNumber10 retval (m_value);
     m_value = ((uint32_t)m_value + 1) % 1024;
+    retval.SetModulusBase (m_modulusBase);
     return retval;
   }
 
diff -Naur ns-3.22/src/lte/model/lte-rlc-tag.cc ns-3.23/src/lte/model/lte-rlc-tag.cc
--- ns-3.22/src/lte/model/lte-rlc-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-tag.cc	2015-05-13 11:05:26.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::RlcTag")
     .SetParent<Tag> ()
+    .SetGroupName("Lte")
     .AddConstructor<RlcTag> ();
   return tid;
 }
diff -Naur ns-3.22/src/lte/model/lte-rlc-tm.cc ns-3.23/src/lte/model/lte-rlc-tm.cc
--- ns-3.22/src/lte/model/lte-rlc-tm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-tm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -48,6 +48,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteRlcTm")
     .SetParent<LteRlc> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteRlcTm> ()
     .AddAttribute ("MaxTxBufferSize",
                    "Maximum Size of the Transmission Buffer (in Bytes)",
diff -Naur ns-3.22/src/lte/model/lte-rlc-um.cc ns-3.23/src/lte/model/lte-rlc-um.cc
--- ns-3.22/src/lte/model/lte-rlc-um.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rlc-um.cc	2015-05-13 11:05:26.000000000 -0700
@@ -56,6 +56,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteRlcUm")
     .SetParent<LteRlc> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteRlcUm> ()
     .AddAttribute ("MaxTxBufferSize",
                    "Maximum Size of the Transmission Buffer (in Bytes)",
diff -Naur ns-3.22/src/lte/model/lte-rrc-header.cc ns-3.23/src/lte/model/lte-rrc-header.cc
--- ns-3.22/src/lte/model/lte-rrc-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rrc-header.cc	2015-05-13 11:05:26.000000000 -0700
@@ -50,6 +50,7 @@
 {
   static TypeId tid = TypeId ("ns3::RrcAsn1Header")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
   ;
   return tid;
 }
@@ -3905,6 +3906,7 @@
 {
   static TypeId tid = TypeId ("ns3::RrcConnectionRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/lte/model/lte-rrc-protocol-ideal.cc ns-3.23/src/lte/model/lte-rrc-protocol-ideal.cc
--- ns-3.22/src/lte/model/lte-rrc-protocol-ideal.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rrc-protocol-ideal.cc	2015-05-13 11:05:26.000000000 -0700
@@ -63,6 +63,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteUeRrcProtocolIdeal")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteUeRrcProtocolIdeal> ()
     ;
   return tid;
@@ -230,6 +231,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteEnbRrcProtocolIdeal")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteEnbRrcProtocolIdeal> ()
     ;
   return tid;
@@ -459,6 +461,7 @@
 {
   static TypeId tid = TypeId ("ns3::IdealHandoverPreparationInfoHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<IdealHandoverPreparationInfoHeader> ()
   ;
   return tid;
@@ -565,6 +568,7 @@
 {
   static TypeId tid = TypeId ("ns3::IdealHandoverCommandHeader")
     .SetParent<Header> ()
+    .SetGroupName("Lte")
     .AddConstructor<IdealHandoverCommandHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/lte-rrc-protocol-real.cc ns-3.23/src/lte/model/lte-rrc-protocol-real.cc
--- ns-3.22/src/lte/model/lte-rrc-protocol-real.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-rrc-protocol-real.cc	2015-05-13 11:05:26.000000000 -0700
@@ -68,6 +68,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteUeRrcProtocolReal")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteUeRrcProtocolReal> ()
   ;
   return tid;
@@ -383,6 +384,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteEnbRrcProtocolReal")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteEnbRrcProtocolReal> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/lte-spectrum-phy.cc ns-3.23/src/lte/model/lte-spectrum-phy.cc
--- ns-3.22/src/lte/model/lte-spectrum-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-spectrum-phy.cc	2015-05-13 11:05:26.000000000 -0700
@@ -148,7 +148,6 @@
   m_interferenceData = 0;
   m_interferenceCtrl->Dispose ();
   m_interferenceCtrl = 0;
-  m_ltePhyTxEndCallback      = MakeNullCallback< void, Ptr<const Packet> > ();
   m_ltePhyRxDataEndErrorCallback = MakeNullCallback< void > ();
   m_ltePhyRxDataEndOkCallback    = MakeNullCallback< void, Ptr<Packet> >  ();
   m_ltePhyRxCtrlEndOkCallback = MakeNullCallback< void, std::list<Ptr<LteControlMessage> > > ();
@@ -169,11 +168,17 @@
     case LteSpectrumPhy::RX_DATA:
       os << "RX_DATA";
       break;
-    case LteSpectrumPhy::RX_CTRL:
-      os << "RX_CTRL";
+    case LteSpectrumPhy::RX_DL_CTRL:
+      os << "RX_DL_CTRL";
       break;
-    case LteSpectrumPhy::TX:
-      os << "TX";
+    case LteSpectrumPhy::TX_DATA:
+      os << "TX_DATA";
+      break;
+    case LteSpectrumPhy::TX_DL_CTRL:
+      os << "TX_DL_CTRL";
+      break;
+    case LteSpectrumPhy::TX_UL_SRS:
+      os << "TX_UL_SRS";
       break;
     default:
       os << "UNKNOWN";
@@ -187,6 +192,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteSpectrumPhy")
     .SetParent<SpectrumPhy> ()
+    .SetGroupName("Lte")
     .AddTraceSource ("TxStart",
                      "Trace fired when a new transmission is started",
                      MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyTxStartTrace),
@@ -324,15 +330,6 @@
 }
 
 
-
-void
-LteSpectrumPhy::SetLtePhyTxEndCallback (LtePhyTxEndCallback c)
-{
-  NS_LOG_FUNCTION (this);
-  m_ltePhyTxEndCallback = c;
-}
-
-
 void
 LteSpectrumPhy::SetLtePhyRxDataEndErrorCallback (LtePhyRxDataEndErrorCallback c)
 {
@@ -431,13 +428,16 @@
   m_phyTxStartTrace (pb);
   
   switch (m_state)
-  {
+    {
     case RX_DATA:
-    case RX_CTRL:
+    case RX_DL_CTRL:
+    case RX_UL_SRS:
       NS_FATAL_ERROR ("cannot TX while RX: according to FDD channel acces, the physical layer for transmission cannot be used for reception");
       break;
-      
-    case TX:
+
+    case TX_DATA:
+    case TX_DL_CTRL:      
+    case TX_UL_SRS:
       NS_FATAL_ERROR ("cannot TX while already TX: the MAC should avoid this");
       break;
       
@@ -455,7 +455,7 @@
       // to be used for simulation purposes (e.g., the CellId). This
       // is done by setting the ctrlMsgList parameter of
       // LteSpectrumSignalParametersDataFrame
-      ChangeState (TX);
+      ChangeState (TX_DATA);
       NS_ASSERT (m_channel);
       Ptr<LteSpectrumSignalParametersDataFrame> txParams = Create<LteSpectrumSignalParametersDataFrame> ();
       txParams->duration = duration;
@@ -466,7 +466,7 @@
       txParams->ctrlMsgList = ctrlMsgList;
       txParams->cellId = m_cellId;
       m_channel->StartTx (txParams);
-      m_endTxEvent = Simulator::Schedule (duration, &LteSpectrumPhy::EndTx, this);
+      m_endTxEvent = Simulator::Schedule (duration, &LteSpectrumPhy::EndTxData, this);
     }
     return false;
     break;
@@ -484,17 +484,17 @@
   NS_LOG_FUNCTION (this << " PSS " << (uint16_t)pss);
   NS_LOG_LOGIC (this << " state: " << m_state);
   
-  
-//   m_phyTxStartTrace (pb);
-  
   switch (m_state)
   {
     case RX_DATA:
-    case RX_CTRL:
+    case RX_DL_CTRL:
+    case RX_UL_SRS:
       NS_FATAL_ERROR ("cannot TX while RX: according to FDD channel acces, the physical layer for transmission cannot be used for reception");
       break;
       
-    case TX:
+    case TX_DATA:
+    case TX_DL_CTRL:
+    case TX_UL_SRS:
       NS_FATAL_ERROR ("cannot TX while already TX: the MAC should avoid this");
       break;
       
@@ -511,7 +511,7 @@
       // to be used for simulation purposes (e.g., the CellId). This
       // is done by setting the cellId parameter of
       // LteSpectrumSignalParametersDlCtrlFrame
-      ChangeState (TX);
+      ChangeState (TX_DL_CTRL);
       NS_ASSERT (m_channel);
 
       Ptr<LteSpectrumSignalParametersDlCtrlFrame> txParams = Create<LteSpectrumSignalParametersDlCtrlFrame> ();
@@ -523,7 +523,7 @@
       txParams->pss = pss;
       txParams->ctrlMsgList = ctrlMsgList;
       m_channel->StartTx (txParams);
-      m_endTxEvent = Simulator::Schedule (DL_CTRL_DURATION, &LteSpectrumPhy::EndTx, this);
+      m_endTxEvent = Simulator::Schedule (DL_CTRL_DURATION, &LteSpectrumPhy::EndTxDlCtrl, this);
     }
     return false;
     break;
@@ -542,16 +542,17 @@
   NS_LOG_FUNCTION (this);
   NS_LOG_LOGIC (this << " state: " << m_state);
   
-  //   m_phyTxStartTrace (pb);
-  
   switch (m_state)
-  {
+    {
     case RX_DATA:
-    case RX_CTRL:
+    case RX_DL_CTRL:
+    case RX_UL_SRS:
       NS_FATAL_ERROR ("cannot TX while RX: according to FDD channel acces, the physical layer for transmission cannot be used for reception");
       break;
       
-    case TX:
+    case TX_DL_CTRL:
+    case TX_DATA:
+    case TX_UL_SRS:
       NS_FATAL_ERROR ("cannot TX while already TX: the MAC should avoid this");
       break;
       
@@ -569,7 +570,7 @@
       // to be used for simulation purposes (e.g., the CellId). This
       // is done by setting the cellId parameter of 
       // LteSpectrumSignalParametersDlCtrlFrame
-      ChangeState (TX);
+      ChangeState (TX_UL_SRS);
       NS_ASSERT (m_channel);
       Ptr<LteSpectrumSignalParametersUlSrsFrame> txParams = Create<LteSpectrumSignalParametersUlSrsFrame> ();
       txParams->duration = UL_SRS_DURATION;
@@ -578,7 +579,7 @@
       txParams->psd = m_txPsd;
       txParams->cellId = m_cellId;
       m_channel->StartTx (txParams);
-      m_endTxEvent = Simulator::Schedule (UL_SRS_DURATION, &LteSpectrumPhy::EndTx, this);
+      m_endTxEvent = Simulator::Schedule (UL_SRS_DURATION, &LteSpectrumPhy::EndTxUlSrs, this);
     }
     return false;
     break;
@@ -593,30 +594,42 @@
 
 
 void
-LteSpectrumPhy::EndTx ()
+LteSpectrumPhy::EndTxData ()
 {
   NS_LOG_FUNCTION (this);
   NS_LOG_LOGIC (this << " state: " << m_state);
 
-  NS_ASSERT (m_state == TX);
-
+  NS_ASSERT (m_state == TX_DATA);
   m_phyTxEndTrace (m_txPacketBurst);
+  m_txPacketBurst = 0;
+  ChangeState (IDLE);
+}
 
-  if (!m_ltePhyTxEndCallback.IsNull ())
-    {
-      for (std::list<Ptr<Packet> >::const_iterator iter = m_txPacketBurst->Begin (); iter
-           != m_txPacketBurst->End (); ++iter)
-        {
-          Ptr<Packet> packet = (*iter)->Copy ();
-          m_ltePhyTxEndCallback (packet);
-        }
-    }
+void
+LteSpectrumPhy::EndTxDlCtrl ()
+{
+  NS_LOG_FUNCTION (this);
+  NS_LOG_LOGIC (this << " state: " << m_state);
 
-  m_txPacketBurst = 0;
+  NS_ASSERT (m_state == TX_DL_CTRL);
+  NS_ASSERT (m_txPacketBurst == 0);
+  ChangeState (IDLE);
+}
+
+void
+LteSpectrumPhy::EndTxUlSrs ()
+{
+  NS_LOG_FUNCTION (this);
+  NS_LOG_LOGIC (this << " state: " << m_state);
+
+  NS_ASSERT (m_state == TX_UL_SRS);
+  NS_ASSERT (m_txPacketBurst == 0);
   ChangeState (IDLE);
 }
 
 
+
+
 void
 LteSpectrumPhy::StartRx (Ptr<SpectrumSignalParameters> spectrumRxParams)
 {
@@ -629,28 +642,29 @@
   // the device might start RX only if the signal is of a type
   // understood by this device - in this case, an LTE signal.
   Ptr<LteSpectrumSignalParametersDataFrame> lteDataRxParams = DynamicCast<LteSpectrumSignalParametersDataFrame> (spectrumRxParams);
+  Ptr<LteSpectrumSignalParametersDlCtrlFrame> lteDlCtrlRxParams = DynamicCast<LteSpectrumSignalParametersDlCtrlFrame> (spectrumRxParams);
+  Ptr<LteSpectrumSignalParametersUlSrsFrame> lteUlSrsRxParams = DynamicCast<LteSpectrumSignalParametersUlSrsFrame> (spectrumRxParams);
   if (lteDataRxParams != 0)
     {
       m_interferenceData->AddSignal (rxPsd, duration);
       StartRxData (lteDataRxParams);
     }
-  else
+  else if (lteDlCtrlRxParams!=0)
     {
-      Ptr<LteSpectrumSignalParametersDlCtrlFrame> lteDlCtrlRxParams = DynamicCast<LteSpectrumSignalParametersDlCtrlFrame> (spectrumRxParams);
-      Ptr<LteSpectrumSignalParametersUlSrsFrame> lteUlSrsRxParams = DynamicCast<LteSpectrumSignalParametersUlSrsFrame> (spectrumRxParams);
-      if ((lteDlCtrlRxParams!=0)||(lteUlSrsRxParams!=0))
-        {
-          m_interferenceCtrl->AddSignal (rxPsd, duration);
-          StartRxCtrl (spectrumRxParams);
-        }
-      else
-        {
-          // other type of signal (could be 3G, GSM, whatever) -> interference
-          m_interferenceData->AddSignal (rxPsd, duration);
-          m_interferenceCtrl->AddSignal (rxPsd, duration);
-        }
+      m_interferenceCtrl->AddSignal (rxPsd, duration);
+      StartRxDlCtrl (lteDlCtrlRxParams);
     }
-
+  else if (lteUlSrsRxParams!=0)
+    {
+      m_interferenceCtrl->AddSignal (rxPsd, duration);
+      StartRxUlSrs (lteUlSrsRxParams);
+    }
+  else
+    {
+      // other type of signal (could be 3G, GSM, whatever) -> interference
+      m_interferenceData->AddSignal (rxPsd, duration);
+      m_interferenceCtrl->AddSignal (rxPsd, duration);
+    }    
 }
 
 void
@@ -659,10 +673,12 @@
   NS_LOG_FUNCTION (this);
   switch (m_state)
     {
-      case TX:
+      case TX_DATA:
+      case TX_DL_CTRL:
+      case TX_UL_SRS:
         NS_FATAL_ERROR ("cannot RX while TX: according to FDD channel access, the physical layer for transmission cannot be used for reception");
         break;
-      case RX_CTRL:
+      case RX_DL_CTRL:
         NS_FATAL_ERROR ("cannot RX Data while receiving control");
         break;
       case IDLE:
@@ -730,101 +746,155 @@
 
 
 void
-LteSpectrumPhy::StartRxCtrl (Ptr<SpectrumSignalParameters> params)
+LteSpectrumPhy::StartRxDlCtrl (Ptr<LteSpectrumSignalParametersDlCtrlFrame> lteDlCtrlRxParams)
 {
   NS_LOG_FUNCTION (this);
+
+  // To check if we're synchronized to this signal, we check
+  // for the CellId which is reported in the
+  // LteSpectrumSignalParametersDlCtrlFrame
+  uint16_t cellId;        
+  NS_ASSERT (lteDlCtrlRxParams != 0);
+  cellId = lteDlCtrlRxParams->cellId;
+
   switch (m_state)
-  {
-    case TX:
+    {
+    case TX_DATA:
+    case TX_DL_CTRL:
+    case TX_UL_SRS:
+    case RX_DATA:
+    case RX_UL_SRS:
+      NS_FATAL_ERROR ("unexpected event in state " << m_state);
+      break;
+
+    case RX_DL_CTRL:
+    case IDLE:
+
+      // common code for the two states
+      // check presence of PSS for UE measuerements
+      if (lteDlCtrlRxParams->pss == true)
+        {
+          if (!m_ltePhyRxPssCallback.IsNull ())
+              {
+                m_ltePhyRxPssCallback (cellId, lteDlCtrlRxParams->psd);
+              }
+        }   
+
+      // differentiated code for the two states
+      switch (m_state)
+        {
+        case RX_DL_CTRL:
+          NS_ASSERT_MSG (m_cellId != cellId, "any other DlCtrl should be from a different cell");
+          NS_LOG_LOGIC (this << " ignoring other DlCtrl (cellId=" 
+                        << cellId  << ", m_cellId=" << m_cellId << ")");      
+          break;
+          
+        case IDLE:
+          if (cellId  == m_cellId)
+            {
+              NS_LOG_LOGIC (this << " synchronized with this signal (cellId=" << cellId << ")");
+              
+              NS_ASSERT (m_rxControlMessageList.empty ());
+              m_firstRxStart = Simulator::Now ();
+              m_firstRxDuration = lteDlCtrlRxParams->duration;
+              NS_LOG_LOGIC (this << " scheduling EndRx with delay " << lteDlCtrlRxParams->duration);
+              
+              // store the DCIs
+              m_rxControlMessageList = lteDlCtrlRxParams->ctrlMsgList;
+              m_endRxDlCtrlEvent = Simulator::Schedule (lteDlCtrlRxParams->duration, &LteSpectrumPhy::EndRxDlCtrl, this);
+              ChangeState (RX_DL_CTRL);
+              m_interferenceCtrl->StartRx (lteDlCtrlRxParams->psd);            
+            }
+          else
+            {
+              NS_LOG_LOGIC (this << " not synchronizing with this signal (cellId=" 
+                            << cellId  << ", m_cellId=" << m_cellId << ")");          
+            }
+          break;
+          
+        default:
+          NS_FATAL_ERROR ("unexpected event in state " << m_state);
+          break;
+        }
+      break; // case RX_DL_CTRL or IDLE
+      
+    default:
+      NS_FATAL_ERROR ("unknown state");
+      break;
+    }
+  
+  NS_LOG_LOGIC (this << " state: " << m_state);
+}
+
+
+
+
+void
+LteSpectrumPhy::StartRxUlSrs (Ptr<LteSpectrumSignalParametersUlSrsFrame> lteUlSrsRxParams)
+{
+  NS_LOG_FUNCTION (this);
+  switch (m_state)
+    {
+    case TX_DATA:
+    case TX_DL_CTRL:
+    case TX_UL_SRS:
       NS_FATAL_ERROR ("cannot RX while TX: according to FDD channel access, the physical layer for transmission cannot be used for reception");
       break;
+
     case RX_DATA:
-      NS_FATAL_ERROR ("cannot RX data while receing control");
+    case RX_DL_CTRL:
+      NS_FATAL_ERROR ("cannot RX SRS while receiving something else");
       break;
+
     case IDLE:
-    case RX_CTRL:
+    case RX_UL_SRS:
       // the behavior is similar when
-      // we're IDLE or RX because we can receive more signals
-      // simultaneously (e.g., at the eNB).
+      // we're IDLE or RX_UL_SRS because we can receive more signals
+      // simultaneously at the eNB
       {
         // To check if we're synchronized to this signal, we check
         // for the CellId which is reported in the
         // LteSpectrumSignalParametersDlCtrlFrame
         uint16_t cellId;
-        bool dl;
-        Ptr<LteSpectrumSignalParametersDlCtrlFrame> lteDlCtrlRxParams = DynamicCast<LteSpectrumSignalParametersDlCtrlFrame> (params);
-        if (lteDlCtrlRxParams!=0)
-          {
-            cellId = lteDlCtrlRxParams->cellId;
-            dl = true;
-          }
-        else
-          {
-            Ptr<LteSpectrumSignalParametersUlSrsFrame> lteUlSrsRxParams = DynamicCast<LteSpectrumSignalParametersUlSrsFrame> (params);
-            cellId = lteUlSrsRxParams->cellId;
-            dl = false;
-          }
-        if (dl)
-            {
-              // check presence of PSS for UE measuerements
-              if (lteDlCtrlRxParams->pss == true)
-                {
-                  SpectrumValue pssPsd = *params->psd;
-                  if (!m_ltePhyRxPssCallback.IsNull ())
-                    {
-                      m_ltePhyRxPssCallback (cellId, params->psd);
-                    }
-                }
-            }
+        cellId = lteUlSrsRxParams->cellId;
         if (cellId  == m_cellId)
-        {
-          NS_LOG_LOGIC (this << " synchronized with this signal (cellId=" << cellId << ")");
-          if (m_state == IDLE)
           {
-            // first transmission, i.e., we're IDLE and we
-            // start RX
-            NS_ASSERT (m_rxControlMessageList.empty ());
-            m_firstRxStart = Simulator::Now ();
-            m_firstRxDuration = params->duration;
-            NS_LOG_LOGIC (this << " scheduling EndRx with delay " << params->duration);
-            if (dl==true)
+            NS_LOG_LOGIC (this << " synchronized with this signal (cellId=" << cellId << ")");
+            if (m_state == IDLE)
               {
-                // store the DCIs
-                m_rxControlMessageList = lteDlCtrlRxParams->ctrlMsgList;
-                m_endRxDlCtrlEvent = Simulator::Schedule (params->duration, &LteSpectrumPhy::EndRxDlCtrl, this);
+                // first transmission, i.e., we're IDLE and we
+                // start RX
+                NS_ASSERT (m_rxControlMessageList.empty ());
+                m_firstRxStart = Simulator::Now ();
+                m_firstRxDuration = lteUlSrsRxParams->duration;
+                NS_LOG_LOGIC (this << " scheduling EndRx with delay " << lteUlSrsRxParams->duration);
+
+                m_endRxUlSrsEvent = Simulator::Schedule (lteUlSrsRxParams->duration, &LteSpectrumPhy::EndRxUlSrs, this);
               }
-            else
+            else if (m_state == RX_UL_SRS)
               {
-                m_endRxUlSrsEvent = Simulator::Schedule (params->duration, &LteSpectrumPhy::EndRxUlSrs, this);
-              }
+                // sanity check: if there are multiple RX events, they
+                // should occur at the same time and have the same
+                // duration, otherwise the interference calculation
+                // won't be correct
+                NS_ASSERT ((m_firstRxStart == Simulator::Now ()) 
+                           && (m_firstRxDuration == lteUlSrsRxParams->duration));
+              }            
+            ChangeState (RX_UL_SRS);
+            m_interferenceCtrl->StartRx (lteUlSrsRxParams->psd);          
           }
-          else if (m_state == RX_CTRL)
+        else
           {
-            // sanity check: if there are multiple RX events, they
-            // should occur at the same time and have the same
-            // duration, otherwise the interference calculation
-            // won't be correct
-            NS_ASSERT ((m_firstRxStart == Simulator::Now ()) 
-            && (m_firstRxDuration == params->duration));
+            NS_LOG_LOGIC (this << " not in sync with this signal (cellId=" 
+                          << cellId  << ", m_cellId=" << m_cellId << ")");          
           }
-          
-          ChangeState (RX_CTRL);
-          m_interferenceCtrl->StartRx (params->psd);
-          
-//           NS_LOG_LOGIC (this << " numSimultaneousRxEvents = " << m_rxPacketBurstList.size ());
-        }
-        else
-        {
-          NS_LOG_LOGIC (this << " not in sync with this signal (cellId=" 
-          << cellId  << ", m_cellId=" << m_cellId << ")");          
-        }
       }
       break;
       
-      default:
-        NS_FATAL_ERROR ("unknown state");
-        break;
-  }
+    default:
+      NS_FATAL_ERROR ("unknown state");
+      break;
+    }
   
   NS_LOG_LOGIC (this << " state: " << m_state);
 }
@@ -1062,7 +1132,7 @@
   NS_LOG_FUNCTION (this);
   NS_LOG_LOGIC (this << " state: " << m_state);
   
-  NS_ASSERT (m_state == RX_CTRL);
+  NS_ASSERT (m_state == RX_DL_CTRL);
   
   // this will trigger CQI calculation and Error Model evaluation
   // as a side effect, the error model should update the error status of all TBs
@@ -1108,7 +1178,7 @@
 void
 LteSpectrumPhy::EndRxUlSrs ()
 {
-  NS_ASSERT (m_state == RX_CTRL);
+  NS_ASSERT (m_state == RX_UL_SRS);
   ChangeState (IDLE);
   m_interferenceCtrl->EndRx ();
   // nothing to do (used only for SRS at this stage)
diff -Naur ns-3.22/src/lte/model/lte-spectrum-phy.h ns-3.23/src/lte/model/lte-spectrum-phy.h
--- ns-3.22/src/lte/model/lte-spectrum-phy.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-spectrum-phy.h	2015-05-13 11:05:26.000000000 -0700
@@ -162,7 +162,7 @@
    */
   enum State
   {
-    IDLE, TX, RX_DATA, RX_CTRL
+    IDLE, TX_DL_CTRL, TX_DATA, TX_UL_SRS, RX_DL_CTRL, RX_DATA, RX_UL_SRS
   };
 
   // inherited from Object
@@ -179,7 +179,8 @@
   Ptr<AntennaModel> GetRxAntenna ();
   void StartRx (Ptr<SpectrumSignalParameters> params);
   void StartRxData (Ptr<LteSpectrumSignalParametersDataFrame> params);
-  void StartRxCtrl (Ptr<SpectrumSignalParameters> params);
+  void StartRxDlCtrl (Ptr<LteSpectrumSignalParametersDlCtrlFrame> lteDlCtrlRxParams);
+  void StartRxUlSrs (Ptr<LteSpectrumSignalParametersUlSrsFrame> lteUlSrsRxParams);
 
   void SetHarqPhyModule (Ptr<LteHarqPhy> harq);
 
@@ -420,7 +421,9 @@
 
 private:
   void ChangeState (State newState);
-  void EndTx ();
+  void EndTxData ();
+  void EndTxDlCtrl ();
+  void EndTxUlSrs ();
   void EndRxData ();
   void EndRxDlCtrl ();
   void EndRxUlSrs ();
@@ -453,7 +456,6 @@
   TracedCallback<Ptr<const Packet> > m_phyRxEndOkTrace;
   TracedCallback<Ptr<const Packet> > m_phyRxEndErrorTrace;
 
-  LtePhyTxEndCallback        m_ltePhyTxEndCallback;
   LtePhyRxDataEndErrorCallback   m_ltePhyRxDataEndErrorCallback;
   LtePhyRxDataEndOkCallback      m_ltePhyRxDataEndOkCallback;
   
diff -Naur ns-3.22/src/lte/model/lte-ue-mac.cc ns-3.23/src/lte/model/lte-ue-mac.cc
--- ns-3.22/src/lte/model/lte-ue-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-ue-mac.cc	2015-05-13 11:05:26.000000000 -0700
@@ -195,6 +195,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteUeMac")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteUeMac> ();
   return tid;
 }
diff -Naur ns-3.22/src/lte/model/lte-ue-phy.cc ns-3.23/src/lte/model/lte-ue-phy.cc
--- ns-3.22/src/lte/model/lte-ue-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-ue-phy.cc	2015-05-13 11:05:26.000000000 -0700
@@ -22,6 +22,7 @@
 
 #include <ns3/object-factory.h>
 #include <ns3/log.h>
+#include <ns3/node.h>
 #include <cfloat>
 #include <cmath>
 #include <ns3/simulator.h>
@@ -162,7 +163,6 @@
 
   NS_ASSERT_MSG (Simulator::Now ().GetNanoSeconds () == 0,
                  "Cannot create UE devices after simulation started");
-  Simulator::ScheduleNow (&LteUePhy::SubframeIndication, this, 1, 1);
   Simulator::Schedule (m_ueMeasurementsFilterPeriod, &LteUePhy::ReportUeMeasurements, this);
 
   DoReset ();
@@ -190,6 +190,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteUePhy")
     .SetParent<LtePhy> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteUePhy> ()
     .AddAttribute ("TxPower",
                    "Transmission power in dBm",
@@ -301,6 +302,25 @@
 LteUePhy::DoInitialize ()
 {
   NS_LOG_FUNCTION (this);
+  bool haveNodeId = false;
+  uint32_t nodeId = 0;
+  if (m_netDevice != 0)
+    {
+      Ptr<Node> node = m_netDevice->GetNode ();
+      if (node != 0)
+        {
+          nodeId = node->GetId ();
+          haveNodeId = true;
+        }
+    }
+  if (haveNodeId)
+    {
+      Simulator::ScheduleWithContext (nodeId, Seconds (0), &LteUePhy::SubframeIndication, this, 1, 1);
+    }
+  else
+    {
+      Simulator::ScheduleNow (&LteUePhy::SubframeIndication, this, 1, 1);
+    }  
   LtePhy::DoInitialize ();
 }
 
@@ -558,9 +578,15 @@
               // store measurements
               std::map <uint16_t, UeMeasurementsElement>::iterator itMeasMap;
               itMeasMap = m_ueMeasurementsMap.find ((*itPss).cellId);
-              NS_ASSERT (itMeasMap != m_ueMeasurementsMap.end ());
-              (*itMeasMap).second.rsrqSum += rsrq_dB;
-              (*itMeasMap).second.rsrqNum++;
+              if (itMeasMap != m_ueMeasurementsMap.end ())
+                {
+                  (*itMeasMap).second.rsrqSum += rsrq_dB;
+                  (*itMeasMap).second.rsrqNum++;
+                }
+              else
+                {
+                  NS_LOG_WARN ("race condition of bug 2091 occurred");
+                }
             }
 
           itPss++;
diff -Naur ns-3.22/src/lte/model/lte-ue-power-control.cc ns-3.23/src/lte/model/lte-ue-power-control.cc
--- ns-3.22/src/lte/model/lte-ue-power-control.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-ue-power-control.cc	2015-05-13 11:05:26.000000000 -0700
@@ -72,6 +72,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteUePowerControl")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteUePowerControl> ()
     .AddAttribute ("ClosedLoop",
                    "If true Closed Loop mode will be active, otherwise Open Loop",
diff -Naur ns-3.22/src/lte/model/lte-ue-rrc.cc ns-3.23/src/lte/model/lte-ue-rrc.cc
--- ns-3.22/src/lte/model/lte-ue-rrc.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/lte-ue-rrc.cc	2015-05-13 11:05:26.000000000 -0700
@@ -169,6 +169,7 @@
 {
   static TypeId tid = TypeId ("ns3::LteUeRrc")
     .SetParent<Object> ()
+    .SetGroupName("Lte")
     .AddConstructor<LteUeRrc> ()
     .AddAttribute ("DataRadioBearerMap", "List of UE RadioBearerInfo for Data Radio Bearers by LCID.",
                    ObjectMapValue (),
diff -Naur ns-3.22/src/lte/model/no-op-handover-algorithm.cc ns-3.23/src/lte/model/no-op-handover-algorithm.cc
--- ns-3.22/src/lte/model/no-op-handover-algorithm.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/no-op-handover-algorithm.cc	2015-05-13 11:05:26.000000000 -0700
@@ -56,6 +56,7 @@
 {
   static TypeId tid = TypeId ("ns3::NoOpHandoverAlgorithm")
     .SetParent<LteHandoverAlgorithm> ()
+    .SetGroupName("Lte")
     .AddConstructor<NoOpHandoverAlgorithm> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/pf-ff-mac-scheduler.cc ns-3.23/src/lte/model/pf-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/pf-ff-mac-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/pf-ff-mac-scheduler.cc	2015-05-13 11:05:26.000000000 -0700
@@ -252,6 +252,7 @@
 {
   static TypeId tid = TypeId ("ns3::PfFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<PfFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/pss-ff-mac-scheduler.cc ns-3.23/src/lte/model/pss-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/pss-ff-mac-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/pss-ff-mac-scheduler.cc	2015-05-13 11:05:26.000000000 -0700
@@ -255,6 +255,7 @@
 {
   static TypeId tid = TypeId ("ns3::PssFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<PssFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/rem-spectrum-phy.cc ns-3.23/src/lte/model/rem-spectrum-phy.cc
--- ns-3.22/src/lte/model/rem-spectrum-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/rem-spectrum-phy.cc	2015-05-13 11:05:26.000000000 -0700
@@ -68,6 +68,7 @@
 {
   static TypeId tid = TypeId ("ns3::RemSpectrumPhy")
     .SetParent<SpectrumPhy> ()
+    .SetGroupName("Lte")
     .AddConstructor<RemSpectrumPhy> ()
   ;
   return tid;
diff -Naur ns-3.22/src/lte/model/rr-ff-mac-scheduler.cc ns-3.23/src/lte/model/rr-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/rr-ff-mac-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/rr-ff-mac-scheduler.cc	2015-05-13 11:05:26.000000000 -0700
@@ -251,6 +251,7 @@
 {
   static TypeId tid = TypeId ("ns3::RrFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<RrFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/tdbet-ff-mac-scheduler.cc ns-3.23/src/lte/model/tdbet-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/tdbet-ff-mac-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/tdbet-ff-mac-scheduler.cc	2015-05-13 11:05:26.000000000 -0700
@@ -249,6 +249,7 @@
 {
   static TypeId tid = TypeId ("ns3::TdBetFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<TdBetFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/tdmt-ff-mac-scheduler.cc ns-3.23/src/lte/model/tdmt-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/tdmt-ff-mac-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/tdmt-ff-mac-scheduler.cc	2015-05-13 11:05:26.000000000 -0700
@@ -248,6 +248,7 @@
 {
   static TypeId tid = TypeId ("ns3::TdMtFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<TdMtFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/tdtbfq-ff-mac-scheduler.cc ns-3.23/src/lte/model/tdtbfq-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/tdtbfq-ff-mac-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/tdtbfq-ff-mac-scheduler.cc	2015-05-13 11:05:26.000000000 -0700
@@ -253,6 +253,7 @@
 {
   static TypeId tid = TypeId ("ns3::TdTbfqFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<TdTbfqFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/model/trace-fading-loss-model.cc ns-3.23/src/lte/model/trace-fading-loss-model.cc
--- ns-3.22/src/lte/model/trace-fading-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/trace-fading-loss-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::TraceFadingLossModel")
     .SetParent<SpectrumPropagationLossModel> ()
+    .SetGroupName("Lte")
     .AddConstructor<TraceFadingLossModel> ()
     .AddAttribute ("TraceFilename",
                    "Name of file to load a trace from.",
diff -Naur ns-3.22/src/lte/model/tta-ff-mac-scheduler.cc ns-3.23/src/lte/model/tta-ff-mac-scheduler.cc
--- ns-3.22/src/lte/model/tta-ff-mac-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/model/tta-ff-mac-scheduler.cc	2015-05-13 11:05:26.000000000 -0700
@@ -248,6 +248,7 @@
 {
   static TypeId tid = TypeId ("ns3::TtaFfMacScheduler")
     .SetParent<FfMacScheduler> ()
+    .SetGroupName("Lte")
     .AddConstructor<TtaFfMacScheduler> ()
     .AddAttribute ("CqiTimerThreshold",
                    "The number of TTIs a CQI is valid (default 1000 - 1 sec.)",
diff -Naur ns-3.22/src/lte/test/lte-simple-helper.cc ns-3.23/src/lte/test/lte-simple-helper.cc
--- ns-3.22/src/lte/test/lte-simple-helper.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-simple-helper.cc	2015-05-13 11:05:26.000000000 -0700
@@ -149,6 +149,8 @@
   m_enbMac = CreateObject<LteTestMac> ();
   m_enbMac->SetDevice (enbDev);
 
+  m_enbRrc->SetDevice (enbDev);
+
   enbDev->SetReceiveCallback (MakeCallback (&LteTestMac::Receive, m_enbMac));
 
   // Connect SAPs: RRC <-> PDCP <-> RLC <-> MAC
diff -Naur ns-3.22/src/lte/test/lte-test-downlink-power-control.cc ns-3.23/src/lte/test/lte-test-downlink-power-control.cc
--- ns-3.22/src/lte/test/lte-test-downlink-power-control.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-downlink-power-control.cc	2015-05-13 11:05:26.000000000 -0700
@@ -41,9 +41,11 @@
 #include <ns3/lte-ue-rrc.h>
 
 #include "lte-ffr-simple.h"
-#include "lte-test-sinr-chunk-processor.h"
 #include <ns3/lte-common.h>
 
+
+#include <ns3/lte-chunk-processor.h>
+
 #include "lte-test-downlink-power-control.h"
 #include <ns3/lte-rrc-sap.h>
 
@@ -441,17 +443,21 @@
 
   Ptr<LtePhy> ue1Phy = ueDevs.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
 
-  Ptr<LteTestSinrChunkProcessor> testDlDataPowerReceived = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testDlDataPowerReceived = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher dlDataPowerReceivedCatcher;
+  testDlDataPowerReceived->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &dlDataPowerReceivedCatcher));
   ue1Phy->GetDownlinkSpectrumPhy ()->AddDataPowerChunkProcessor (testDlDataPowerReceived);
 
-  Ptr<LteTestSinrChunkProcessor> testDlCtrlPowerReceived = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testDlCtrlPowerReceived = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher dlCtrlPowerReceivedCatcher;
+  testDlCtrlPowerReceived->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &dlCtrlPowerReceivedCatcher));
   ue1Phy->GetDownlinkSpectrumPhy ()->AddRsPowerChunkProcessor (testDlCtrlPowerReceived);
 
   Simulator::Stop (Seconds (0.400));
   Simulator::Run ();
 
-  double dataPower = 10.0 * std::log10 (testDlDataPowerReceived->GetSinr ()->operator[] (0));
-  double ctrlPower = 10.0 * std::log10 (testDlCtrlPowerReceived->GetSinr ()->operator[] (0));
+  double dataPower = 10.0 * std::log10 (dlDataPowerReceivedCatcher.GetValue ()->operator[] (0));
+  double ctrlPower = 10.0 * std::log10 (dlCtrlPowerReceivedCatcher.GetValue ()->operator[] (0));
   double powerDiff = (-1.0)*ctrlPower + dataPower;
 
   NS_LOG_DEBUG ("DataPower: " << dataPower);
diff -Naur ns-3.22/src/lte/test/lte-test-downlink-sinr.cc ns-3.23/src/lte/test/lte-test-downlink-sinr.cc
--- ns-3.22/src/lte/test/lte-test-downlink-sinr.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-downlink-sinr.cc	2015-05-13 11:05:26.000000000 -0700
@@ -28,12 +28,12 @@
 #include "ns3/boolean.h"
 #include "ns3/lte-phy-tag.h"
 #include "lte-test-ue-phy.h"
-#include "lte-test-sinr-chunk-processor.h"
 #include "ns3/lte-spectrum-signal-parameters.h"
 
 #include "lte-test-downlink-sinr.h"
 #include <ns3/lte-control-messages.h>
 #include "ns3/lte-helper.h"
+#include <ns3/lte-chunk-processor.h>
 
 using namespace ns3;
 
@@ -112,7 +112,7 @@
   : TestCase ("SINR calculation in downlink Data frame: " + name),
     m_sv (sv),
     m_sm (sv->GetSpectrumModel ()),
-    m_sinr (sinr)
+    m_expectedSinr (sinr)
 {
   NS_LOG_INFO ("Creating LenaDownlinkSinrTestCase");
 }
@@ -121,6 +121,7 @@
 {
 }
 
+
 void
 LteDownlinkDataSinrTestCase::DoRun (void)
 {
@@ -135,7 +136,9 @@
   dlPhy->SetCellId (cellId);
   ulPhy->SetCellId (cellId);
 
-  Ptr<LteTestSinrChunkProcessor> chunkProcessor = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> chunkProcessor = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher actualSinrCatcher;
+  chunkProcessor->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &actualSinrCatcher));
   dlPhy->AddDataSinrChunkProcessor (chunkProcessor);
 
   /**
@@ -260,16 +263,10 @@
   Simulator::Stop (Seconds (5.0));
   Simulator::Run ();
 
-  /**
-   * Check that the values passed to LteChunkProcessor::EvaluateChunk () correspond
-   * to known values which have been calculated offline (with octave) for the generated signals
-   */
-  Ptr<SpectrumValue> calculatedSinr = chunkProcessor->GetSinr ();
-
-  NS_LOG_INFO ("Data Frame - Theoretical SINR: " << *m_sinr);
-  NS_LOG_INFO ("Data Frame - Calculated SINR: " << *calculatedSinr);
+  NS_LOG_INFO ("Data Frame - Theoretical SINR: " << *m_expectedSinr);
+  NS_LOG_INFO ("Data Frame - Calculated SINR: " << *(actualSinrCatcher.GetValue ()));
  
-  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL(*calculatedSinr, *m_sinr, 0.0000001, "Data Frame - Wrong SINR !");
+  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL(*(actualSinrCatcher.GetValue ()), *m_expectedSinr, 0.0000001, "Data Frame - Wrong SINR !");
   dlPhy->Dispose ();
   Simulator::Destroy ();
 }
@@ -284,7 +281,7 @@
 : TestCase ("SINR calculation in downlink Ctrl Frame: " + name),
 m_sv (sv),
 m_sm (sv->GetSpectrumModel ()),
-m_sinr (sinr)
+m_expectedSinr (sinr)
 {
   NS_LOG_INFO ("Creating LenaDownlinkCtrlSinrTestCase");
 }
@@ -307,9 +304,11 @@
   dlPhy->SetCellId (cellId);
   ulPhy->SetCellId (cellId);
   
-  Ptr<LteTestSinrChunkProcessor> chunkProcessor = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> chunkProcessor = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher actualSinrCatcher;
+  chunkProcessor->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &actualSinrCatcher));
   dlPhy->AddCtrlSinrChunkProcessor (chunkProcessor);
-  
+
   /**
   * Generate several calls to LteSpectrumPhy::StartRx corresponding to several signals. One will be the signal of interest, i.e., the
   *  LteSpectrumSignalParametersDlCtrlFrame of the first signal will have the
@@ -432,16 +431,10 @@
   Simulator::Stop (Seconds (5.0));
   Simulator::Run ();
   
-  /**
-  * Check that the values passed to LteChunkProcessor::EvaluateChunk () correspond
-  * to known values which have been calculated offline (with octave) for the generated signals
-  */
-  Ptr<SpectrumValue> calculatedSinr = chunkProcessor->GetSinr ();
-  
-  NS_LOG_INFO ("Ctrl Frame - Theoretical SINR: " << *m_sinr);
-  NS_LOG_INFO ("Ctrl Frame - Calculated SINR: " << *calculatedSinr);
+  NS_LOG_INFO ("Ctrl Frame - Theoretical SINR: " << *m_expectedSinr);
+  NS_LOG_INFO ("Ctrl Frame - Calculated SINR: " << *(actualSinrCatcher.GetValue ()));
   
-  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL(*calculatedSinr, *m_sinr, 0.0000001, "Data Frame - Wrong SINR !");
+  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL(*(actualSinrCatcher.GetValue ()), *m_expectedSinr, 0.0000001, "Data Frame - Wrong SINR !");
   dlPhy->Dispose ();
   Simulator::Destroy ();
 }
diff -Naur ns-3.22/src/lte/test/lte-test-downlink-sinr.h ns-3.23/src/lte/test/lte-test-downlink-sinr.h
--- ns-3.22/src/lte/test/lte-test-downlink-sinr.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-downlink-sinr.h	2015-05-13 11:05:27.000000000 -0700
@@ -50,7 +50,7 @@
 
   Ptr<SpectrumValue> m_sv;
   Ptr<const SpectrumModel> m_sm;
-  Ptr<SpectrumValue> m_sinr;
+  Ptr<SpectrumValue> m_expectedSinr;
 };
 
 
@@ -59,13 +59,13 @@
   public:
     LteDownlinkCtrlSinrTestCase (Ptr<SpectrumValue> sv, Ptr<SpectrumValue> sinr, std::string name);
     virtual ~LteDownlinkCtrlSinrTestCase ();
-    
-  private:
-    virtual void DoRun (void);
-    
-    Ptr<SpectrumValue> m_sv;
-    Ptr<const SpectrumModel> m_sm;
-    Ptr<SpectrumValue> m_sinr;
+  
+private:
+  virtual void DoRun (void);
+  
+  Ptr<SpectrumValue> m_sv;
+  Ptr<const SpectrumModel> m_sm;
+  Ptr<SpectrumValue> m_expectedSinr;
 };
 
 #endif /* LTE_TEST_DOWNLINK_SINR_H */
diff -Naur ns-3.22/src/lte/test/lte-test-entities.cc ns-3.23/src/lte/test/lte-test-entities.cc
--- ns-3.22/src/lte/test/lte-test-entities.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-entities.cc	2015-05-13 11:05:27.000000000 -0700
@@ -20,6 +20,7 @@
 
 #include "ns3/simulator.h"
 #include "ns3/log.h"
+#include "ns3/node.h"
 
 #include "ns3/lte-rlc-header.h"
 #include "ns3/lte-rlc-am-header.h"
@@ -72,6 +73,12 @@
 }
 
 void
+LteTestRrc::SetDevice (Ptr<NetDevice> device)
+{
+  m_device = device;
+}
+
+void
 LteTestRrc::SetLtePdcpSapProvider (LtePdcpSapProvider* s)
 {
   m_pdcpSapProvider = s;
@@ -196,8 +203,26 @@
   p.rnti = 1111;
   p.lcid = 222;
   p.pdcpSdu = Create<Packet> (m_pduSize);
+  
+  bool haveContext = false;
+  Ptr<Node> node;
+  if (m_device != 0)
+    {
+      node = m_device->GetNode ();
+      if (node != 0)
+        {                    
+          haveContext = true;
+        }
+    }
+  if (haveContext)
+    {
+      Simulator::ScheduleWithContext (node->GetId (), Seconds (0), &LtePdcpSapProvider::TransmitPdcpSdu, m_pdcpSapProvider, p);
+    }
+  else
+    {
+      Simulator::Schedule (Seconds (0), &LtePdcpSapProvider::TransmitPdcpSdu, m_pdcpSapProvider, p);
+    }
 
-  Simulator::ScheduleNow (&LtePdcpSapProvider::TransmitPdcpSdu, m_pdcpSapProvider, p);
   m_nextPdu = Simulator::Schedule (m_arrivalTime, &LteTestRrc::Start, this);
 //   Simulator::Run ();
 }
@@ -449,7 +474,25 @@
 LteTestMac::SendTxOpportunity (Time time, uint32_t bytes)
 {
   NS_LOG_FUNCTION (this << time << bytes);
-  Simulator::Schedule (time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, bytes, 0, 0);
+  bool haveContext = false;
+  Ptr<Node> node;
+  if (m_device != 0)
+    {
+      node = m_device->GetNode ();
+      if (node != 0)
+        {                    
+          haveContext = true;
+        }
+    }
+  if (haveContext)
+    {
+      Simulator::ScheduleWithContext (node->GetId (), time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, bytes, 0, 0);
+    }
+  else
+    {
+      Simulator::Schedule (time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, bytes, 0, 0);
+    }
+    
   if (m_txOpportunityMode == RANDOM_MODE)
   {
     if (m_txOppTime != Seconds (0))
@@ -568,20 +611,25 @@
 
   if (m_txOpportunityMode == AUTOMATIC_MODE)
     {
-      if (params.statusPduSize)
-        {
-          Simulator::Schedule (Seconds (0.1), &LteMacSapUser::NotifyTxOpportunity,
-                               m_macSapUser, params.statusPduSize + 2, 0, 0);
+      // cancel all previously scheduled TxOpps
+      for (std::list<EventId>::iterator it = m_nextTxOppList.begin ();
+           it != m_nextTxOppList.end ();
+           ++it)
+        {          
+          it->Cancel ();
         }
-      else if (params.txQueueSize)
-        {
-          Simulator::Schedule (Seconds (0.1), &LteMacSapUser::NotifyTxOpportunity,
-                               m_macSapUser, params.txQueueSize + 2, 0, 0);
-        }
-      else if (params.retxQueueSize)
+      m_nextTxOppList.clear ();
+
+      int32_t size = params.statusPduSize + params.txQueueSize  + params.retxQueueSize;
+      Time time = m_txOppTime;
+      while (size > 0)
         {
-          Simulator::Schedule (Seconds (0.1), &LteMacSapUser::NotifyTxOpportunity,
-                               m_macSapUser, params.retxQueueSize + 2, 0, 0);
+          EventId e = Simulator::Schedule (time, 
+                                           &LteMacSapUser::NotifyTxOpportunity,
+                                           m_macSapUser, m_txOppSize, 0, 0);
+          m_nextTxOppList.push_back (e);
+          size -= m_txOppSize;
+          time += m_txOppTime;
         }
     }
 }
diff -Naur ns-3.22/src/lte/test/lte-test-entities.h ns-3.23/src/lte/test/lte-test-entities.h
--- ns-3.22/src/lte/test/lte-test-entities.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-entities.h	2015-05-13 11:05:27.000000000 -0700
@@ -82,6 +82,8 @@
     void SetArrivalTime (Time arrivalTime);
     void SetPduSize (uint32_t pduSize);
 
+  void SetDevice (Ptr<NetDevice> device);
+
   private:
     // Interface forwarded by LtePdcpSapUser
     virtual void DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameters params);
@@ -101,6 +103,8 @@
     EventId m_nextPdu;
     Time m_arrivalTime;
     uint32_t m_pduSize;
+
+    Ptr<NetDevice> m_device;
 };
 
 /////////////////////////////////////////////////////////////////////
@@ -246,6 +250,7 @@
     EventId m_nextTxOpp;
     Time m_txOppTime;
     uint32_t m_txOppSize;
+    std::list<EventId> m_nextTxOppList;
 
     // Stats
     uint32_t m_txPdus;
diff -Naur ns-3.22/src/lte/test/lte-test-fading.cc ns-3.23/src/lte/test/lte-test-fading.cc
--- ns-3.22/src/lte/test/lte-test-fading.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-fading.cc	2015-05-13 11:05:27.000000000 -0700
@@ -239,7 +239,7 @@
       sum.at (i) = 0.;
       sumSquared.at (i) = 0.;
     }
-  for (uint i = 0; i < m_fadingSamples.size (); i++)
+  for (std::vector<SpectrumValue>::size_type i = 0; i != m_fadingSamples.size (); i++)
   {
     NS_LOG_INFO ("Sample time " << time << " : " << m_fadingSamples.at(i)[0] << " " << m_fadingSamples.at(i)[1]);
     time += samplingInterval;
diff -Naur ns-3.22/src/lte/test/lte-test-frequency-reuse.cc ns-3.23/src/lte/test/lte-test-frequency-reuse.cc
--- ns-3.22/src/lte/test/lte-test-frequency-reuse.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-frequency-reuse.cc	2015-05-13 11:05:27.000000000 -0700
@@ -46,7 +46,6 @@
 
 #include "lte-ffr-simple.h"
 #include "lte-simple-spectrum-phy.h"
-#include "lte-test-sinr-chunk-processor.h"
 #include <ns3/lte-common.h>
 
 #include "lte-test-frequency-reuse.h"
diff -Naur ns-3.22/src/lte/test/lte-test-interference.cc ns-3.23/src/lte/test/lte-test-interference.cc
--- ns-3.22/src/lte/test/lte-test-interference.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-interference.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,9 +35,10 @@
 #include "ns3/lte-ue-phy.h"
 #include "ns3/lte-ue-net-device.h"
 
+#include <ns3/lte-chunk-processor.h>
+
 #include "lte-test-interference.h"
 
-#include "lte-test-sinr-chunk-processor.h"
 
 using namespace ns3;
 
@@ -67,9 +68,12 @@
 LteInterferenceTestSuite::LteInterferenceTestSuite ()
   : TestSuite ("lte-interference", SYSTEM)
 {
+  // these two first test cases have a spectral efficiency that corresponds to CQI=0 (out of range)
+  // TODO: update the test conditions to handle out-of-range correctly
+  // AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10",  50.000000, 10.000000,  0.040000, 0.040000,  0.010399, 0.010399, 0, 0), TestCase::QUICK);
+  // AddTestCase (new LteInterferenceTestCase ("d1=50, d2=20",  50.000000, 20.000000,  0.160000, 0.159998,  0.041154, 0.041153, 0, 0), TestCase::QUICK);
+
   AddTestCase (new LteInterferenceTestCase ("d1=3000, d2=6000",  3000.000000, 6000.000000,  3.844681, 1.714583,  0.761558, 0.389662, 6, 4), TestCase::QUICK);
-  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10",  50.000000, 10.000000,  0.040000, 0.040000,  0.010399, 0.010399, 0, 0), TestCase::QUICK);
-  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=20",  50.000000, 20.000000,  0.160000, 0.159998,  0.041154, 0.041153, 0, 0), TestCase::QUICK);
   AddTestCase (new LteInterferenceTestCase ("d1=50, d2=50",  50.000000, 50.000000,  0.999997, 0.999907,  0.239828, 0.239808, 2, 2), TestCase::QUICK);
   AddTestCase (new LteInterferenceTestCase ("d1=50, d2=100",  50.000000, 100.000000,  3.999955, 3.998520,  0.785259, 0.785042, 6, 6), TestCase::QUICK);
   AddTestCase (new LteInterferenceTestCase ("d1=50, d2=200",  50.000000, 200.000000,  15.999282, 15.976339,  1.961072, 1.959533, 14, 14), TestCase::QUICK);
@@ -95,8 +99,8 @@
   : TestCase (name),
     m_d1 (d1),
     m_d2 (d2),
-    m_dlSinrDb (10 * std::log10 (dlSinr)),
-    m_ulSinrDb (10 * std::log10 (ulSinr)),
+    m_expectedDlSinrDb (10 * std::log10 (dlSinr)),
+    m_expectedUlSinrDb (10 * std::log10 (ulSinr)),
     m_dlMcs (dlMcs),
     m_ulMcs (ulMcs)
 {
@@ -174,11 +178,15 @@
   // we plug in two instances, one for DL and one for UL
 
   Ptr<LtePhy> ue1Phy = ueDevs1.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testDlSinr1 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testDlSinr1 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher dlSinr1Catcher;
+  testDlSinr1->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &dlSinr1Catcher));
   ue1Phy->GetDownlinkSpectrumPhy ()->AddDataSinrChunkProcessor (testDlSinr1);
 
   Ptr<LtePhy> enb1phy = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testUlSinr1 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testUlSinr1 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher ulSinr1Catcher;
+  testUlSinr1->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &ulSinr1Catcher));
   enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr1);
 
   Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/DlScheduling",
@@ -191,11 +199,15 @@
   // same as above for eNB2 and UE2
 
   Ptr<LtePhy> ue2Phy = ueDevs2.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testDlSinr2 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testDlSinr2 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher dlSinr2Catcher;
+  testDlSinr2->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &dlSinr2Catcher));
   ue2Phy->GetDownlinkSpectrumPhy ()->AddDataSinrChunkProcessor (testDlSinr2);
 
   Ptr<LtePhy> enb2phy = enbDevs.Get (1)->GetObject<LteEnbNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testUlSinr2 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testUlSinr2 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher ulSinr2Catcher;
+  testUlSinr2->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &ulSinr2Catcher));
   enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr2);
 
   Config::Connect ("/NodeList/1/DeviceList/0/LteEnbMac/DlScheduling",
@@ -210,19 +222,19 @@
 
   if (m_dlMcs > 0)
     {
-      double dlSinr1Db = 10.0 * std::log10 (testDlSinr1->GetSinr ()->operator[] (0));
-      NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr1Db, m_dlSinrDb, 0.01, "Wrong SINR in DL! (eNB1 --> UE1)");
+      double dlSinr1Db = 10.0 * std::log10 (dlSinr1Catcher.GetValue ()->operator[] (0));
+      NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr1Db, m_expectedDlSinrDb, 0.01, "Wrong SINR in DL! (eNB1 --> UE1)");
 
-      double dlSinr2Db = 10.0 * std::log10 (testDlSinr2->GetSinr ()->operator[] (0));
-      NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr2Db, m_dlSinrDb, 0.01, "Wrong SINR in DL! (eNB2 --> UE2)");
+      double dlSinr2Db = 10.0 * std::log10 (dlSinr2Catcher.GetValue ()->operator[] (0));
+      NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr2Db, m_expectedDlSinrDb, 0.01, "Wrong SINR in DL! (eNB2 --> UE2)");
     }
   if (m_ulMcs > 0)
     {
-      double ulSinr1Db = 10.0 * std::log10 (testUlSinr1->GetSinr ()->operator[] (0));
-      NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr1Db, m_ulSinrDb, 0.01, "Wrong SINR in UL!  (UE1 --> eNB1)");
+      double ulSinr1Db = 10.0 * std::log10 (ulSinr1Catcher.GetValue ()->operator[] (0));
+      NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr1Db, m_expectedUlSinrDb, 0.01, "Wrong SINR in UL!  (UE1 --> eNB1)");
       
-      double ulSinr2Db = 10.0 * std::log10 (testUlSinr2->GetSinr ()->operator[] (0));
-      NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr2Db, m_ulSinrDb, 0.01, "Wrong SINR in UL!  (UE2 --> eNB2)");
+      double ulSinr2Db = 10.0 * std::log10 (ulSinr2Catcher.GetValue ()->operator[] (0));
+      NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr2Db, m_expectedUlSinrDb, 0.01, "Wrong SINR in UL!  (UE2 --> eNB2)");
     }
 
   Simulator::Destroy ();
diff -Naur ns-3.22/src/lte/test/lte-test-interference-fr.cc ns-3.23/src/lte/test/lte-test-interference-fr.cc
--- ns-3.22/src/lte/test/lte-test-interference-fr.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-interference-fr.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,7 +39,7 @@
 
 #include "lte-test-interference-fr.h"
 
-#include "lte-test-sinr-chunk-processor.h"
+#include <ns3/lte-chunk-processor.h>
 
 #include "lte-simple-spectrum-phy.h"
 #include "ns3/spectrum-value.h"
@@ -50,6 +50,8 @@
 
 NS_LOG_COMPONENT_DEFINE ("LteInterferenceFrTest");
 
+
+
 /**
  * TestSuite
  */
@@ -82,8 +84,8 @@
   : TestCase ("Test: " + name),
     m_d1 (d1),
     m_d2 (d2),
-    m_dlSinrDb (10 * std::log10 (dlSinr)),
-    m_ulSinrDb (10 * std::log10 (ulSinr))
+    m_expectedDlSinrDb (10 * std::log10 (dlSinr)),
+    m_expectedUlSinrDb (10 * std::log10 (ulSinr))
 {
   NS_LOG_INFO ("Creating LteInterferenceFrTestCase");
 }
@@ -174,21 +176,29 @@
   // we plug in two instances, one for DL and one for UL
 
   Ptr<LtePhy> ue1Phy = ueDevs1.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testDlSinr1 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testDlSinr1 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher dlSinr1Catcher;
+  testDlSinr1->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &dlSinr1Catcher));
   ue1Phy->GetDownlinkSpectrumPhy ()->AddDataSinrChunkProcessor (testDlSinr1);
 
   Ptr<LtePhy> enb1phy = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testUlSinr1 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testUlSinr1 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher ulSinr1Catcher;
+  testUlSinr1->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &ulSinr1Catcher));
   enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr1);
 
   // same as above for eNB2 and UE2
 
   Ptr<LtePhy> ue2Phy = ueDevs2.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testDlSinr2 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testDlSinr2 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher dlSinr2Catcher;
+  testDlSinr2->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &dlSinr2Catcher));
   ue2Phy->GetDownlinkSpectrumPhy ()->AddDataSinrChunkProcessor (testDlSinr2);
 
   Ptr<LtePhy> enb2phy = enbDevs.Get (1)->GetObject<LteEnbNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testUlSinr2 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testUlSinr2 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher ulSinr2Catcher;
+  testUlSinr2->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &ulSinr2Catcher));
   enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr2);
 
 // need to allow for RRC connection establishment + SRS
@@ -198,33 +208,33 @@
 
   for (uint32_t i = 0; i < 12; i++)
     {
-      double dlSinr1 = testDlSinr1->GetSinr ()->operator[] (i);
+      double dlSinr1 = dlSinr1Catcher.GetValue ()->operator[] (i);
       double dlSinr1Db = 10.0 * std::log10 (dlSinr1);
-      NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr1Db, m_dlSinrDb, 0.01, "Wrong SINR in DL! (eNB1 --> UE1)");
+      NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr1Db, m_expectedDlSinrDb, 0.01, "Wrong SINR in DL! (eNB1 --> UE1)");
 
 
-      double dlSinr2 = testDlSinr2->GetSinr ()->operator[] (i);
+      double dlSinr2 = dlSinr2Catcher.GetValue ()->operator[] (i);
       NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr2, 0, 0.01, "Wrong SINR in DL! (eNB2 --> UE2)");
     }
 
   for (uint32_t i = 12; i < 24; i++)
     {
-      double dlSinr1 = testDlSinr1->GetSinr ()->operator[] (i);
+      double dlSinr1 = dlSinr1Catcher.GetValue ()->operator[] (i);
       NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr1, 0, 0.01, "Wrong SINR in DL! (eNB1 --> UE1)");
 
-      double dlSinr2 = testDlSinr2->GetSinr ()->operator[] (i);
+      double dlSinr2 = dlSinr2Catcher.GetValue ()->operator[] (i);
       double dlSinr2Db = 10.0 * std::log10 (dlSinr2);
-      NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr2Db, m_dlSinrDb, 0.01, "Wrong SINR in DL! (eNB2 --> UE2)");
+      NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr2Db, m_expectedDlSinrDb, 0.01, "Wrong SINR in DL! (eNB2 --> UE2)");
     }
 
   //FR algorithms do not operate in uplink now, so we do not test it
-//  double ulSinr1Db = 10.0 * std::log10 (testUlSinr1->GetSinr ()->operator[] (0));
+//  double ulSinr1Db = 10.0 * std::log10 (testUlSinr1->GetValue ()->operator[] (0));
 //  NS_LOG_DEBUG("ulSinr1Db: "<< ulSinr1Db);
-//  NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr1Db, m_ulSinrDb, 0.01, "Wrong SINR in UL!  (UE1 --> eNB1)");
+//  NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr1Db, m_expectedUlSinrDb, 0.01, "Wrong SINR in UL!  (UE1 --> eNB1)");
 //
-//  double ulSinr2Db = 10.0 * std::log10 (testUlSinr2->GetSinr ()->operator[] (0));
+//  double ulSinr2Db = 10.0 * std::log10 (testUlSinr2->GetValue ()->operator[] (0));
 //  NS_LOG_DEBUG("ulSinr2Db: "<< ulSinr2Db);
-//  NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr2Db, m_ulSinrDb, 0.01, "Wrong SINR in UL!  (UE2 --> eNB2)");
+//  NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr2Db, m_expectedUlSinrDb, 0.01, "Wrong SINR in UL!  (UE2 --> eNB2)");
 
   Simulator::Destroy ();
 }
@@ -344,21 +354,29 @@
   // we plug in two instances, one for DL and one for UL
 
   Ptr<LtePhy> ue1Phy = ueDevs1.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testDlSinr1 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testDlSinr1 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher dlSinr1Catcher;
+  testDlSinr1->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &dlSinr1Catcher));
   ue1Phy->GetDownlinkSpectrumPhy ()->AddDataSinrChunkProcessor (testDlSinr1);
 
   Ptr<LtePhy> enb1phy = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testUlSinr1 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testUlSinr1 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher ulSinr1Catcher;
+  testUlSinr1->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &ulSinr1Catcher));
   enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr1);
 
   // same as above for eNB2 and UE2
 
   Ptr<LtePhy> ue2Phy = ueDevs2.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testDlSinr2 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testDlSinr2 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher dlSinr2Catcher;
+  testDlSinr2->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &dlSinr2Catcher));
   ue2Phy->GetDownlinkSpectrumPhy ()->AddDataSinrChunkProcessor (testDlSinr2);
 
   Ptr<LtePhy> enb2phy = enbDevs.Get (1)->GetObject<LteEnbNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testUlSinr2 = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testUlSinr2 = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher ulSinr2Catcher;
+  testUlSinr2->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &ulSinr2Catcher));
   enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr2);
 
 // need to allow for UE Measurement report
@@ -368,46 +386,46 @@
 
   for (uint32_t i = 0; i < 12; i++)
     {
-      double dlSinr1 = testDlSinr1->GetSinr ()->operator[] (i);
+      double dlSinr1 = dlSinr1Catcher.GetValue ()->operator[] (i);
       double dlSinr1Db = 10.0 * std::log10 (dlSinr1);
       NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr1Db, m_commonDlSinrDb, 0.01, "Wrong SINR in DL! (eNB1 --> UE1)");
 
 
-      double dlSinr2 = testDlSinr2->GetSinr ()->operator[] (i);
+      double dlSinr2 = dlSinr2Catcher.GetValue ()->operator[] (i);
       double dlSinr2Db = 10.0 * std::log10 (dlSinr2);
       NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr2Db, m_commonDlSinrDb, 0.01, "Wrong SINR in DL! (eNB2 --> UE2)");
     }
 
   for (uint32_t i = 12; i < 18; i++)
     {
-      double dlSinr1 = testDlSinr1->GetSinr ()->operator[] (i);
+      double dlSinr1 = dlSinr1Catcher.GetValue ()->operator[] (i);
       double dlSinr1Db = 10.0 * std::log10 (dlSinr1);
       NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr1Db, m_edgeDlSinrDb, 0.01, "Wrong SINR in DL! (eNB1 --> UE1)");
 
 
-      double dlSinr2 = testDlSinr2->GetSinr ()->operator[] (i);
+      double dlSinr2 = dlSinr2Catcher.GetValue ()->operator[] (i);
       NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr2, 0, 0.01, "Wrong SINR in DL! (eNB2 --> UE2)");
     }
 
   for (uint32_t i = 18; i < 24; i++)
     {
-      double dlSinr1 = testDlSinr1->GetSinr ()->operator[] (i);
+      double dlSinr1 = dlSinr1Catcher.GetValue ()->operator[] (i);
       NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr1, 0, 0.01, "Wrong SINR in DL! (eNB1 --> UE1)");
 
-      double dlSinr2 = testDlSinr2->GetSinr ()->operator[] (i);
+      double dlSinr2 = dlSinr2Catcher.GetValue ()->operator[] (i);
       double dlSinr2Db = 10.0 * std::log10 (dlSinr2);
       NS_TEST_ASSERT_MSG_EQ_TOL (dlSinr2Db, m_edgeDlSinrDb, 0.01, "Wrong SINR in DL! (eNB2 --> UE2)");
     }
 
 
   //FR algorithms do not operate in uplink now, so we do not test it
-//  double ulSinr1Db = 10.0 * std::log10 (testUlSinr1->GetSinr ()->operator[] (0));
+//  double ulSinr1Db = 10.0 * std::log10 (testUlSinr1->GetValue ()->operator[] (0));
 //  NS_LOG_DEBUG("ulSinr1Db: "<< ulSinr1Db);
-//  NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr1Db, m_ulSinrDb, 0.01, "Wrong SINR in UL!  (UE1 --> eNB1)");
+//  NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr1Db, m_expectedUlSinrDb, 0.01, "Wrong SINR in UL!  (UE1 --> eNB1)");
 //
-//  double ulSinr2Db = 10.0 * std::log10 (testUlSinr2->GetSinr ()->operator[] (0));
+//  double ulSinr2Db = 10.0 * std::log10 (testUlSinr2->GetValue ()->operator[] (0));
 //  NS_LOG_DEBUG("ulSinr2Db: "<< ulSinr2Db);
-//  NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr2Db, m_ulSinrDb, 0.01, "Wrong SINR in UL!  (UE2 --> eNB2)");
+//  NS_TEST_ASSERT_MSG_EQ_TOL (ulSinr2Db, m_expectedUlSinrDb, 0.01, "Wrong SINR in UL!  (UE2 --> eNB2)");
 
   Simulator::Destroy ();
 }
diff -Naur ns-3.22/src/lte/test/lte-test-interference-fr.h ns-3.23/src/lte/test/lte-test-interference-fr.h
--- ns-3.22/src/lte/test/lte-test-interference-fr.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-interference-fr.h	2015-05-13 11:05:27.000000000 -0700
@@ -49,8 +49,8 @@
 
   double m_d1;
   double m_d2;
-  double m_dlSinrDb;
-  double m_ulSinrDb;
+  double m_expectedDlSinrDb;
+  double m_expectedUlSinrDb;
 };
 
 class LteInterferenceStrictFrTestCase : public TestCase
diff -Naur ns-3.22/src/lte/test/lte-test-interference.h ns-3.23/src/lte/test/lte-test-interference.h
--- ns-3.22/src/lte/test/lte-test-interference.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-interference.h	2015-05-13 11:05:27.000000000 -0700
@@ -56,8 +56,8 @@
 
   double m_d1;
   double m_d2;
-  double m_dlSinrDb;
-  double m_ulSinrDb;
+  double m_expectedDlSinrDb;
+  double m_expectedUlSinrDb;
   uint16_t m_dlMcs;
   uint16_t m_ulMcs;
 };
diff -Naur ns-3.22/src/lte/test/lte-test-link-adaptation.cc ns-3.23/src/lte/test/lte-test-link-adaptation.cc
--- ns-3.22/src/lte/test/lte-test-link-adaptation.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-link-adaptation.cc	2015-05-13 11:05:27.000000000 -0700
@@ -31,9 +31,10 @@
 #include "ns3/lte-ue-phy.h"
 #include "ns3/lte-ue-net-device.h"
 
+#include <ns3/lte-chunk-processor.h>
+
 #include "lte-test-link-adaptation.h"
 
-#include "lte-test-sinr-chunk-processor.h"
 
 using namespace ns3;
 
@@ -206,7 +207,9 @@
   // Use testing chunk processor in the PHY layer
   // It will be used to test that the SNR is as intended
   Ptr<LtePhy> uePhy = ueDevs.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testSinr = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testSinr = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher sinrCatcher;
+  testSinr->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &sinrCatcher));
   uePhy->GetDownlinkSpectrumPhy ()->AddCtrlSinrChunkProcessor (testSinr);
 
   Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/DlScheduling",
@@ -215,7 +218,7 @@
   Simulator::Stop (Seconds (0.040));
   Simulator::Run ();
 
-  double calculatedSinrDb = 10.0 * std::log10 (testSinr->GetSinr ()->operator[] (0));
+  double calculatedSinrDb = 10.0 * std::log10 (sinrCatcher.GetValue ()->operator[] (0));
   NS_TEST_ASSERT_MSG_EQ_TOL (calculatedSinrDb, m_snrDb, 0.0000001, "Wrong SINR !");
   Simulator::Destroy ();
 }
diff -Naur ns-3.22/src/lte/test/lte-test-pathloss-model.cc ns-3.23/src/lte/test/lte-test-pathloss-model.cc
--- ns-3.22/src/lte/test/lte-test-pathloss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-pathloss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -47,7 +47,6 @@
 #include <ns3/lte-enb-phy.h>
 #include <ns3/lte-ue-phy.h>
 
-#include "lte-test-sinr-chunk-processor.h"
 #include "lte-test-ue-phy.h"
 #include "lte-test-pathloss-model.h"
 
@@ -271,7 +270,9 @@
   // Use testing chunk processor in the PHY layer
   // It will be used to test that the SNR is as intended
   //Ptr<LtePhy> uePhy = ueDevs.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testSinr = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testSinr = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher sinrCatcher;
+  testSinr->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &sinrCatcher));
   uePhy->GetDownlinkSpectrumPhy ()->AddCtrlSinrChunkProcessor (testSinr);
    
 //   Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/DlScheduling",
@@ -280,7 +281,7 @@
   Simulator::Stop (Seconds (0.035));
   Simulator::Run ();
   
-  double calculatedSinrDb = 10.0 * std::log10 (testSinr->GetSinr ()->operator[] (0));
+  double calculatedSinrDb = 10.0 * std::log10 (sinrCatcher.GetValue ()->operator[] (0));
   NS_LOG_INFO ("Distance " << m_distance << " Calculated SINR " << calculatedSinrDb << " ref " << m_snrDb);
   Simulator::Destroy ();
   NS_TEST_ASSERT_MSG_EQ_TOL (calculatedSinrDb, m_snrDb, 0.001, "Wrong SINR !");
diff -Naur ns-3.22/src/lte/test/lte-test-rlc-am-e2e.cc ns-3.23/src/lte/test/lte-test-rlc-am-e2e.cc
--- ns-3.22/src/lte/test/lte-test-rlc-am-e2e.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-rlc-am-e2e.cc	2015-05-13 11:05:27.000000000 -0700
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: Manuel Requena <manuel.requena@cttc.es>
+ *         Nicola Baldo <nbaldo@cttc.es>
  */
 
 #include "ns3/config.h"
@@ -41,59 +42,71 @@
 
 NS_LOG_COMPONENT_DEFINE ("LteRlcAmE2eTest");
 
-/**
- * Test x.x.x RLC AM: End-to-end flow
- */
-
-/**
- * TestSuite
- */
-
 LteRlcAmE2eTestSuite::LteRlcAmE2eTestSuite ()
   : TestSuite ("lte-rlc-am-e2e", SYSTEM)
 {
   // NS_LOG_INFO ("Creating LteRlcAmE2eTestSuite");
 
-  double losses[] = {0.0, 0.10, 0.25, 0.50, 0.75, 0.90, 0.95};
-  uint32_t seeds[] = {1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999, 10101};
+  double losses[] = {0.0, 0.05,  0.10, 0.15, 0.25, 0.50, 0.75, 0.90, 0.95};
+  uint32_t runs[] = {1111, 2222, 3333, 4444, 5555, 6666, 7777, 8888, 9999, 11110,
+                     12221, 13332, 14443, 15554, 16665, 17776, 18887, 19998, 21109, 22220,
+                     23331, 24442, 25553, 26664, 27775, 28886, 29997, 31108, 32219, 33330};
 
   for ( uint32_t l = 0 ; l < (sizeof (losses) / sizeof (double)) ; l++ )
     {
-      for ( uint32_t s = 0 ; s < (sizeof (seeds) / sizeof (uint32_t)) ; s++ )
+      for ( uint32_t s = 0 ; s < (sizeof (runs) / sizeof (uint32_t)) ; s++ )
         {
-          std::ostringstream name;
-          name << " Losses = " << losses[l] * 100 << "%. Seed = " << seeds[s];
-          TestCase::TestDuration testDuration;
-          if (l == 1 && s == 0)
+          for (uint32_t sduArrivalType = 0; sduArrivalType <= 1; ++sduArrivalType)
             {
-              testDuration = TestCase::QUICK;
+              std::ostringstream name;
+              name << " losses = " << losses[l] * 100 << "%; run = " << runs[s];
+              
+              bool bulkSduArrival;
+              switch (sduArrivalType)
+                {
+                case 0:
+                  bulkSduArrival = false;
+                  name << "; continuous SDU arrival";
+                  break;
+                case 1:
+                  bulkSduArrival = true;
+                  name << "; bulk SDU arrival";
+                  break;
+                default:
+                  NS_FATAL_ERROR ("unsupported option");
+                  break;
+                }
+              
+              TestCase::TestDuration testDuration;
+              if (l == 1 && s == 0)
+                {
+                  testDuration = TestCase::QUICK;
+                }
+              else if (s <= 4)
+                {
+                  testDuration = TestCase::EXTENSIVE;
+                }
+              else
+                {
+                  testDuration = TestCase::TAKES_FOREVER;              
+                }
+              AddTestCase (new LteRlcAmE2eTestCase (name.str (), runs[s], losses[l], bulkSduArrival), testDuration);
             }
-          else
-            {
-              testDuration = TestCase::EXTENSIVE;
-            }
-          AddTestCase (new LteRlcAmE2eTestCase (name.str (), seeds[s], losses[l]), testDuration);
         }
     }
 }
 
 static LteRlcAmE2eTestSuite lteRlcAmE2eTestSuite;
 
-
-/**
- * TestCase
- */
-
-LteRlcAmE2eTestCase::LteRlcAmE2eTestCase (std::string name, uint32_t seed, double losses)
-  : TestCase (name)
+LteRlcAmE2eTestCase::LteRlcAmE2eTestCase (std::string name, uint32_t run, double losses, bool bulkSduArrival)
+   : TestCase (name),
+     m_run (run),
+     m_losses (losses),
+     m_bulkSduArrival (bulkSduArrival),
+     m_dlDrops (0),
+     m_ulDrops (0)
 {
-  // NS_LOG_UNCOND ("Creating LteRlcAmTestingTestCase: " + name);
-
-  m_seed = seed;
-  m_losses = losses;
-
-  m_dlDrops = 0;
-  m_ulDrops = 0;
+  NS_LOG_INFO ("Creating LteRlcAmTestingTestCase: " + name);
 }
 
 LteRlcAmE2eTestCase::~LteRlcAmE2eTestCase ()
@@ -133,7 +146,10 @@
   // LogComponentEnable ("LteRlcUm", level);
   // LogComponentEnable ("LteRlcAm", level);
 
-  RngSeedManager::SetSeed (m_seed);
+  Config::SetGlobal ("RngRun", IntegerValue (m_run));
+  Config::SetDefault ("ns3::LteRlcAm::PollRetransmitTimer", TimeValue (MilliSeconds (20)));
+  Config::SetDefault ("ns3::LteRlcAm::ReorderingTimer", TimeValue (MilliSeconds (10)));
+  Config::SetDefault ("ns3::LteRlcAm::StatusProhibitTimer", TimeValue (MilliSeconds (40)));
 
   Ptr<LteSimpleHelper> lteSimpleHelper = CreateObject<LteSimpleHelper> ();
   // lteSimpleHelper->EnableLogComponents ();
@@ -164,6 +180,9 @@
 
   // Error models: downlink and uplink
   Ptr<RateErrorModel> dlEm = CreateObject<RateErrorModel> ();
+  // fix the stream so that subsequent test cases get a number from the same stream
+  // if RngRun is different, the number shall then be different
+  dlEm->AssignStreams (3);
   dlEm->SetAttribute ("ErrorRate", DoubleValue (m_losses));
   dlEm->SetAttribute ("ErrorUnit", StringValue ("ERROR_UNIT_PACKET"));
 
@@ -177,43 +196,128 @@
 //   enbLteDevs.Get (0)->SetAttribute ("ReceiveErrorModel", PointerValue (enbEm));
 //   enbLteDevs.Get (0)->TraceConnectWithoutContext ("PhyRxDrop", MakeCallback (&LteRlcAmE2eTestCase::EnbDropEvent, this));
 
+
+
+  uint32_t sduSizeBytes = 100;
+  uint32_t numSdu = 1000;
+  double sduStartTimeSeconds = 0.100;
+  double sduStopTimeSeconds;
+  double sduArrivalTimeSeconds;
+  uint32_t dlTxOppSizeBytes = 150;
+  double dlTxOpprTimeSeconds = 0.003;
+  uint32_t ulTxOppSizeBytes = 140;
+  double ulTxOpprTimeSeconds = 0.003;
+
+  if (m_bulkSduArrival)
+    {
+      sduStopTimeSeconds = sduStartTimeSeconds + 0.010;
+    }
+  else
+    {
+      sduStopTimeSeconds = sduStartTimeSeconds + 10;
+    }
+  sduArrivalTimeSeconds = (sduStopTimeSeconds - sduStartTimeSeconds) / numSdu;
+  
+  
+
   // Sending packets from RRC layer
-  lteSimpleHelper->m_enbRrc->SetArrivalTime (Seconds (0.010));
-  lteSimpleHelper->m_enbRrc->SetPduSize (100);
+  lteSimpleHelper->m_enbRrc->SetArrivalTime (Seconds (sduArrivalTimeSeconds));
+  lteSimpleHelper->m_enbRrc->SetPduSize (sduSizeBytes);
 
   // MAC sends transmission opportunities (TxOpp)
-  lteSimpleHelper->m_enbMac->SetTxOppSize (150);
-  lteSimpleHelper->m_enbMac->SetTxOppTime (Seconds (0.005));
-  lteSimpleHelper->m_enbMac->SetTxOpportunityMode (LteTestMac::RANDOM_MODE);
+  lteSimpleHelper->m_enbMac->SetTxOppSize (dlTxOppSizeBytes);
+  lteSimpleHelper->m_enbMac->SetTxOppTime (Seconds (dlTxOpprTimeSeconds));
+  lteSimpleHelper->m_enbMac->SetTxOpportunityMode (LteTestMac::AUTOMATIC_MODE);
 
   // MAC sends transmission opportunities (TxOpp)
-  lteSimpleHelper->m_ueMac->SetTxOppSize (140);
-  lteSimpleHelper->m_ueMac->SetTxOppTime (Seconds (0.015));
-  lteSimpleHelper->m_ueMac->SetTxOpportunityMode (LteTestMac::RANDOM_MODE);
+  lteSimpleHelper->m_ueMac->SetTxOppSize (ulTxOppSizeBytes);
+  lteSimpleHelper->m_ueMac->SetTxOppTime (Seconds (ulTxOpprTimeSeconds));
+  lteSimpleHelper->m_ueMac->SetTxOpportunityMode (LteTestMac::AUTOMATIC_MODE);
 
   // Start/Stop pseudo-application at RRC layer
-  Simulator::Schedule (Seconds (0.100), &LteTestRrc::Start, lteSimpleHelper->m_enbRrc);
-  Simulator::Schedule (Seconds (10.100), &LteTestRrc::Stop, lteSimpleHelper->m_enbRrc);
-
+  Simulator::Schedule (Seconds (sduStartTimeSeconds), &LteTestRrc::Start, lteSimpleHelper->m_enbRrc);
+  Simulator::Schedule (Seconds (sduStopTimeSeconds), &LteTestRrc::Stop, lteSimpleHelper->m_enbRrc);
 
-  Simulator::Stop (Seconds (100.000));
+  
+  double maxDlThroughput = (dlTxOppSizeBytes/(dlTxOppSizeBytes+4.0))*(dlTxOppSizeBytes/dlTxOpprTimeSeconds) * (1.0-m_losses);
+  const double statusProhibitSeconds = 0.020;
+  double pollFrequency = (1.0/dlTxOpprTimeSeconds)*(1-m_losses);
+  double statusFrequency = std::min (pollFrequency, 1.0/statusProhibitSeconds);
+  const uint32_t numNackSnPerStatusPdu = (ulTxOppSizeBytes*8 - 14)/10;
+  double maxRetxThroughput = ((double)numNackSnPerStatusPdu*(double)dlTxOppSizeBytes)*statusFrequency;
+  double throughput = std::min (maxDlThroughput, maxRetxThroughput);
+  double totBytes = ((sduSizeBytes) * (sduStopTimeSeconds - sduStartTimeSeconds) / sduArrivalTimeSeconds);
+
+
+  // note: the throughput estimation is valid only for the full buffer
+  // case. However, the test sends a finite number of SDUs. Hence, the
+  // estimated throughput will only be effective at the beginning of
+  // the test. Towards the end of the test, two issues are present:
+  //   1) no new data is transmitted, hence less feedback is sent,
+  //      hence the transmission rate for the last PDUs to be
+  //      retransmitted is much lower. This effect can be best noteed
+  //      at very high loss rates, and can be adjusted by timers and
+  //      params.
+  //   2) throuhgput is not meaningful, you need to evaluate the time
+  //      it takes for all PDUs to be (re)transmitted successfully,
+  //      i.e., how long it takes for the TX and reTX queues to deplete.
+
+  // Estimating correctly this effect would require a complex stateful
+  // model (e.g., a Markov chain model) so to avoid the hassle we just
+  // use a margin here which we empirically determine as something we
+  // think reasonable based on the PDU loss rate
+  Time margin;
+  if (m_losses < 0.07)
+    {
+      margin = Seconds (0.500);
+    }
+  else if (m_losses < 0.20)
+    {
+      margin = Seconds (1);
+    }
+  else if (m_losses < 0.50)
+    {
+      margin = Seconds (2);
+    }
+  else if (m_losses < 0.70)
+    {
+      margin = Seconds (10);
+    }
+  else if (m_losses < 0.91)
+    {
+      margin = Seconds (20);
+    }
+  else // 0.95
+    {
+      margin = Seconds (30);
+    }
+  Time stopTime = Seconds (std::max (sduStartTimeSeconds + totBytes/throughput, sduStopTimeSeconds)) + margin;
+  
+  NS_LOG_INFO ("statusFrequency=" << statusFrequency << ", maxDlThroughput=" << maxDlThroughput << ", maxRetxThroughput=" << maxRetxThroughput << ", totBytes=" << totBytes << ", stopTime=" << stopTime.GetSeconds () << "s");
+  
+  Simulator::Stop (stopTime);
   Simulator::Run ();
 
   uint32_t txEnbRrcPdus = lteSimpleHelper->m_enbRrc->GetTxPdus ();
   uint32_t rxUeRrcPdus = lteSimpleHelper->m_ueRrc->GetRxPdus ();
 
-  // NS_LOG_INFO ("Seed = " << m_seed);
-  // NS_LOG_INFO ("Losses (%) = " << uint32_t (m_losses * 100));
+  uint32_t txEnbRlcPdus = lteSimpleHelper->m_enbMac->GetTxPdus ();
+  uint32_t rxUeRlcPdus = lteSimpleHelper->m_ueMac->GetRxPdus ();
 
-  // NS_LOG_INFO ("dl dev drops = " << m_dlDrops);
-  // NS_LOG_INFO ("ul dev drops = " << m_ulDrops);
+  NS_LOG_INFO ("Run = " << m_run);
+  NS_LOG_INFO ("Loss rate (%) = " << uint32_t (m_losses * 100));
 
-  // NS_LOG_INFO ("eNB tx RRC count = " << txEnbRrcPdus);
-  // NS_LOG_INFO ("eNB rx RRC count = " << rxEnbRrcPdus);
-  // NS_LOG_INFO ("UE tx RRC count = " << txUeRrcPdus);
-  // NS_LOG_INFO ("UE rx RRC count = " << rxUeRrcPdus);
+  
+  NS_LOG_INFO ("RLC PDUs   TX: " << txEnbRlcPdus 
+               << "   RX: " << rxUeRlcPdus 
+               << "   LOST: " << m_dlDrops
+               << " (" << (100.0 * (double) m_dlDrops)/txEnbRlcPdus << "%)");
+
+  NS_TEST_ASSERT_MSG_EQ (txEnbRlcPdus,  rxUeRlcPdus + m_dlDrops, "lost RLC PDUs don't match TX + RX");  
+                          
+  NS_LOG_INFO ("eNB tx RRC count = " << txEnbRrcPdus);
+  NS_LOG_INFO ("UE rx RRC count = " << rxUeRrcPdus);
 
-  NS_LOG_INFO (m_seed << "\t" << m_losses << "\t" << txEnbRrcPdus << "\t" << rxUeRrcPdus << "\t" << m_dlDrops);
 
   NS_TEST_ASSERT_MSG_EQ (txEnbRrcPdus, rxUeRrcPdus,
                          "TX PDUs (" << txEnbRrcPdus << ") != RX PDUs (" << rxUeRrcPdus << ")");
diff -Naur ns-3.22/src/lte/test/lte-test-rlc-am-e2e.h ns-3.23/src/lte/test/lte-test-rlc-am-e2e.h
--- ns-3.22/src/lte/test/lte-test-rlc-am-e2e.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-rlc-am-e2e.h	2015-05-13 11:05:27.000000000 -0700
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Author: Manuel Requena <manuel.requena@cttc.es>
+ *         Nicola Baldo <nbaldo@cttc.es>
  */
 
 #ifndef LTE_TEST_RLC_AM_E2E_H
@@ -28,7 +29,8 @@
 
 
 /**
- * Test x.x.x RLC AM: End-to-end flow
+ * Provides the test suite lte-rlc-am-e2e. See the testing section of
+ * the LTE module documentation for details.  
  */
 class LteRlcAmE2eTestSuite : public TestSuite
 {
@@ -36,11 +38,15 @@
   LteRlcAmE2eTestSuite ();
 };
 
-
+/**
+ * Test cases used for the test suite lte-rlc-am-e2e. See the testing section of
+ * the LTE module documentation for details.  
+ * 
+ */
 class LteRlcAmE2eTestCase : public TestCase
 {
   public:
-    LteRlcAmE2eTestCase (std::string name, uint32_t seed, double losses);
+  LteRlcAmE2eTestCase (std::string name, uint32_t seed, double losses, bool bulkSduArrival);
     LteRlcAmE2eTestCase ();
     virtual ~LteRlcAmE2eTestCase ();
 
@@ -50,11 +56,13 @@
     void DlDropEvent (Ptr<const Packet> p);
     void UlDropEvent (Ptr<const Packet> p);
 
+    uint32_t m_run;
+    double   m_losses;
+    bool m_bulkSduArrival;
+
     uint32_t m_dlDrops;
     uint32_t m_ulDrops;
 
-    uint32_t m_seed;
-    double   m_losses;
 };
 
 #endif // LTE_TEST_RLC_AM_E2E_H
diff -Naur ns-3.22/src/lte/test/lte-test-rlc-am-transmitter.cc ns-3.23/src/lte/test/lte-test-rlc-am-transmitter.cc
--- ns-3.22/src/lte/test/lte-test-rlc-am-transmitter.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-rlc-am-transmitter.cc	2015-05-13 11:05:27.000000000 -0700
@@ -139,6 +139,7 @@
   txMac->SendTxOpportunity (Seconds (0.150), 30);
   CheckDataReceived (Seconds (0.200), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "SDU is not OK");
 
+  Simulator::Stop (Seconds (0.3));
   Simulator::Run ();
   Simulator::Destroy ();
 }
@@ -181,6 +182,7 @@
   txMac->SendTxOpportunity (Seconds (0.450), 7);
   CheckDataReceived (Seconds (0.500), "YZZ", "Segment #4 is not OK");
 
+  Simulator::Stop (Seconds (0.6));
   Simulator::Run ();
   Simulator::Destroy ();
 }
@@ -217,6 +219,7 @@
   txMac->SendTxOpportunity (Seconds (0.250), 33);
   CheckDataReceived (Seconds (0.300), "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "Concatenation is not OK");
 
+  Simulator::Stop (Seconds (0.4));
   Simulator::Run ();
   Simulator::Destroy ();
 }
@@ -293,6 +296,7 @@
   txMac->SendTxOpportunity (Seconds (1.650), (4+2+1+2) + (3+10+10+7));
   CheckDataReceived (Seconds (1.700), "XYZABCDEFGHIJKLMNOPQRSTUVWXYZ", "SDU #9 is not OK");
 
+  Simulator::Stop (Seconds (2));
   Simulator::Run ();
   Simulator::Destroy ();
 }
diff -Naur ns-3.22/src/lte/test/lte-test-sinr-chunk-processor.cc ns-3.23/src/lte/test/lte-test-sinr-chunk-processor.cc
--- ns-3.22/src/lte/test/lte-test-sinr-chunk-processor.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-sinr-chunk-processor.cc	1969-12-31 16:00:00.000000000 -0800
@@ -1,94 +0,0 @@
-/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Manuel Requena <manuel.requena@cttc.es> : Based on lte-sinr-chunk-processor code
- *         Nicola Baldo <nbaldo>@cttc.es>
- */
-
-#include <ns3/log.h>
-#include <ns3/spectrum-value.h>
-#include "lte-test-sinr-chunk-processor.h"
-
-namespace ns3 {
-
-NS_LOG_COMPONENT_DEFINE ("LteTestSinrChunkProcessor");
-
-LteTestSinrChunkProcessor::LteTestSinrChunkProcessor ()
-{
-  NS_LOG_FUNCTION (this);
-}
-
-LteTestSinrChunkProcessor::~LteTestSinrChunkProcessor ()
-{
-  NS_LOG_FUNCTION (this);
-}
-
-void
-LteTestSinrChunkProcessor::AddCallback (LteChunkProcessorCallback c)
-{
-  NS_LOG_FUNCTION (this);
-}
-
-void
-LteTestSinrChunkProcessor::Start ()
-{
-  NS_LOG_FUNCTION (this);
-  m_sumSinr = 0;
-  m_totDuration = MicroSeconds (0);
-}
-
-void
-LteTestSinrChunkProcessor::EvaluateChunk (const SpectrumValue& sinr, Time duration)
-{
-  NS_LOG_FUNCTION (this << sinr << duration);
-  if (m_sumSinr == 0)
-    {
-      m_sumSinr = Create<SpectrumValue> (sinr.GetSpectrumModel ());
-    }
-  (*m_sumSinr) += sinr * duration.GetSeconds ();
-  m_totDuration += duration;
-  NS_LOG_LOGIC (this << " m_sumSinr = " << *m_sumSinr);
-  NS_LOG_LOGIC (this << " m_totDuration = " << m_totDuration);
-}
-
-void
-LteTestSinrChunkProcessor::End ()
-{
-  NS_LOG_FUNCTION (this);
-  if (m_totDuration.GetSeconds () > 0)
-    {
-      NS_LOG_LOGIC (this << " m_sumSinr = " << *m_sumSinr);
-      NS_LOG_LOGIC (this << " m_totDuration = " << m_totDuration);
-      m_sinr = Create<SpectrumValue> ((*m_sumSinr) / m_totDuration.GetSeconds ());
-      NS_LOG_LOGIC (this << " m_sumSinr / m_totDuration = " << *m_sinr);
-    }
-  else
-    {
-      NS_LOG_WARN ("m_numSinr == 0");
-    }
-}
-
-Ptr<SpectrumValue>
-LteTestSinrChunkProcessor::GetSinr ()
-{
-  NS_LOG_FUNCTION (this);
-
-  NS_ASSERT (m_sinr);
-  return m_sinr;
-}
-
-} // namespace ns3
diff -Naur ns-3.22/src/lte/test/lte-test-sinr-chunk-processor.h ns-3.23/src/lte/test/lte-test-sinr-chunk-processor.h
--- ns-3.22/src/lte/test/lte-test-sinr-chunk-processor.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-sinr-chunk-processor.h	1969-12-31 16:00:00.000000000 -0800
@@ -1,56 +0,0 @@
-/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Manuel Requena <manuel.requena@cttc.es> : Based on lte-sinr-chunk-processor code
- *         Nicola Baldo <nbaldo@cttc.es>
- */
-
-#ifndef LTE_TEST_SINR_CHUNK_PROCESSOR_H
-#define LTE_TEST_SINR_CHUNK_PROCESSOR_H
-
-#include "ns3/lte-chunk-processor.h"
-
-namespace ns3 {
-
-/**
- * This custom LteTestSinrChunkProcessor averages the calculated SINR over time.
- * It is plugged on the receiving SpectrumPhy and therefore
- * receives the SINR SpectrumValue calculated by the LteInterference module.
- */
-class LteTestSinrChunkProcessor : public LteChunkProcessor
-{
-public:
-  LteTestSinrChunkProcessor ();
-  virtual ~LteTestSinrChunkProcessor ();
-
-  virtual void AddCallback (LteChunkProcessorCallback c);
-  virtual void Start ();
-  virtual void EvaluateChunk (const SpectrumValue& sinr, Time duration);
-  virtual void End ();
-
-  Ptr<SpectrumValue> GetSinr ();
-
-private:
-  Ptr<SpectrumValue> m_sumSinr;
-  Ptr<SpectrumValue> m_sinr;
-  Time m_totDuration;
-};
-
-
-} // namespace ns3
-
-#endif /* LTE_TEST_SINR_CHUNK_PROCESSOR_H */
diff -Naur ns-3.22/src/lte/test/lte-test-ue-measurements.cc ns-3.23/src/lte/test/lte-test-ue-measurements.cc
--- ns-3.22/src/lte/test/lte-test-ue-measurements.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-ue-measurements.cc	2015-05-13 11:05:27.000000000 -0700
@@ -51,7 +51,6 @@
 #include <ns3/lte-ue-rrc.h>
 
 #include "lte-test-ue-measurements.h"
-#include "lte-test-sinr-chunk-processor.h"
 #include <ns3/lte-common.h>
 
 using namespace ns3;
@@ -198,33 +197,12 @@
   lteHelper->ActivateDataRadioBearer (ueDevs1, bearer);
   lteHelper->ActivateDataRadioBearer (ueDevs2, bearer);
 
-  // Use testing chunk processor in the PHY layer
-  // It will be used to test that the SNR is as intended
-  // we plug in two instances, one for DL and one for UL
-
-  Ptr<LtePhy> ue1Phy = ueDevs1.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testDlSinr1 = Create<LteTestSinrChunkProcessor> ();
-  ue1Phy->GetDownlinkSpectrumPhy ()->AddDataSinrChunkProcessor (testDlSinr1);
-
-  Ptr<LtePhy> enb1phy = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testUlSinr1 = Create<LteTestSinrChunkProcessor> ();
-  enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr1);
 
   Config::Connect ("/NodeList/2/DeviceList/0/LteUePhy/ReportUeMeasurements",
                    MakeBoundCallback (&ReportUeMeasurementsCallback, this));
   Config::Connect ("/NodeList/0/DeviceList/0/LteEnbRrc/RecvMeasurementReport",
                    MakeBoundCallback (&RecvMeasurementReportCallback, this));
 
-  // same as above for eNB2 and UE2
-
-  Ptr<LtePhy> ue2Phy = ueDevs2.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testDlSinr2 = Create<LteTestSinrChunkProcessor> ();
-  ue2Phy->GetDownlinkSpectrumPhy ()->AddDataSinrChunkProcessor (testDlSinr2);
-
-  Ptr<LtePhy> enb2phy = enbDevs.Get (1)->GetObject<LteEnbNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testUlSinr2 = Create<LteTestSinrChunkProcessor> ();
-  enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr2);
-
   Config::Connect ("/NodeList/3/DeviceList/0/LteUePhy/ReportUeMeasurements",
                    MakeBoundCallback (&ReportUeMeasurementsCallback, this));
   Config::Connect ("/NodeList/1/DeviceList/0/LteEnbRrc/RecvMeasurementReport",
diff -Naur ns-3.22/src/lte/test/lte-test-uplink-power-control.cc ns-3.23/src/lte/test/lte-test-uplink-power-control.cc
--- ns-3.22/src/lte/test/lte-test-uplink-power-control.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-uplink-power-control.cc	2015-05-13 11:05:27.000000000 -0700
@@ -42,7 +42,6 @@
 #include <ns3/lte-ue-rrc.h>
 
 #include "lte-ffr-simple.h"
-#include "lte-test-sinr-chunk-processor.h"
 #include <ns3/lte-common.h>
 
 #include "lte-test-uplink-power-control.h"
diff -Naur ns-3.22/src/lte/test/lte-test-uplink-sinr.cc ns-3.23/src/lte/test/lte-test-uplink-sinr.cc
--- ns-3.22/src/lte/test/lte-test-uplink-sinr.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-uplink-sinr.cc	2015-05-13 11:05:27.000000000 -0700
@@ -28,12 +28,12 @@
 
 #include "ns3/lte-phy-tag.h"
 #include "lte-test-ue-phy.h"
-#include "lte-test-sinr-chunk-processor.h"
 #include "ns3/lte-spectrum-signal-parameters.h"
 
 #include "lte-test-uplink-sinr.h"
 
 #include <ns3/lte-helper.h>
+#include <ns3/lte-chunk-processor.h>
 
 using namespace ns3;
 
@@ -121,7 +121,7 @@
     m_sv1 (sv1),
     m_sv2 (sv2),
     m_sm (sv1->GetSpectrumModel ()),
-    m_sinr (sinr)
+    m_expectedSinr (sinr)
 {
   NS_LOG_INFO ("Creating LteUplinkDataSinrTestCase");
 }
@@ -130,6 +130,7 @@
 {
 }
 
+
 void
 LteUplinkDataSinrTestCase::DoRun (void)
 {
@@ -143,7 +144,9 @@
   dlPhy->SetCellId (cellId);
   ulPhy->SetCellId (cellId);
 
-  Ptr<LteTestSinrChunkProcessor> chunkProcessor = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> chunkProcessor = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher actualSinrCatcher;
+  chunkProcessor->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &actualSinrCatcher));
   ulPhy->AddDataSinrChunkProcessor (chunkProcessor);
 
   /**
@@ -294,16 +297,12 @@
   Simulator::Stop (Seconds (5.0));
   Simulator::Run ();
 
-  /**
-   * Check that the values passed to LteChunkProcessor::EvaluateChunk () correspond
-   * to known values which have been calculated offline (with octave) for the generated signals
-   */
-  Ptr<SpectrumValue> calculatedSinr = chunkProcessor->GetSinr ();
+  NS_LOG_INFO ("Data Frame - Theoretical SINR: " << *m_expectedSinr);
+  NS_LOG_INFO ("Data Frame - Calculated SINR: " << *(actualSinrCatcher.GetValue ()));
 
-  NS_LOG_INFO ("Data Frame - Theoretical SINR: " << *m_sinr);
-  NS_LOG_INFO ("Data Frame - Calculated SINR: " << *calculatedSinr);
-  
-  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL (*calculatedSinr, *m_sinr, 0.0000001, "Data Frame - Wrong SINR !");
+  NS_TEST_EXPECT_MSG_NE (actualSinrCatcher.GetValue (), 0, "no actual SINR reported");
+
+  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL (*(actualSinrCatcher.GetValue ()), *m_expectedSinr, 0.0000001, "Data Frame - Wrong SINR !");
   ulPhy->Dispose ();
   Simulator::Destroy ();
   
@@ -315,11 +314,11 @@
 */
 
 LteUplinkSrsSinrTestCase::LteUplinkSrsSinrTestCase (Ptr<SpectrumValue> sv1, Ptr<SpectrumValue> sv2, Ptr<SpectrumValue> sinr, std::string name)
-: TestCase ("SINR calculation in uplink srs frame: " + name),
-m_sv1 (sv1),
-m_sv2 (sv2),
-m_sm (sv1->GetSpectrumModel ()),
-m_sinr (sinr)
+  : TestCase ("SINR calculation in uplink srs frame: " + name),
+    m_sv1 (sv1),
+    m_sv2 (sv2),
+    m_sm (sv1->GetSpectrumModel ()),
+    m_expectedSinr (sinr)
 {
   NS_LOG_INFO ("Creating LteUplinkSrsSinrTestCase");
 }
@@ -329,6 +328,12 @@
 }
 
 void
+LteUplinkSrsSinrTestCase::ReportSinr (const SpectrumValue& sinr)
+{
+  m_actualSinr = sinr.Copy ();
+}
+
+void
 LteUplinkSrsSinrTestCase::DoRun (void)
 {
   /**
@@ -344,9 +349,10 @@
   dlPhy->SetCellId (cellId);
   ulPhy->SetCellId (cellId);
   
-  Ptr<LteTestSinrChunkProcessor> chunkProcessor = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> chunkProcessor = Create<LteChunkProcessor> ();
+  chunkProcessor->AddCallback (MakeCallback (&LteUplinkSrsSinrTestCase::ReportSinr, this));
   ulPhy->AddCtrlSinrChunkProcessor (chunkProcessor);
-  
+
   /**
   * Generate several calls to LteSpectrumPhy::StartRx corresponding to 
   * several signals.
@@ -464,16 +470,12 @@
   Simulator::Stop (Seconds (5.0));
   Simulator::Run ();
   
-  /**
-  * Check that the values passed to LteChunkProcessor::EvaluateChunk () correspond
-  * to known values which have been calculated offline (with octave) for the generated signals
-  */
-  Ptr<SpectrumValue> calculatedSinr = chunkProcessor->GetSinr ();
+  NS_ASSERT_MSG (m_actualSinr != 0, "no actual SINR reported");
   
-  NS_LOG_INFO ("SRS Frame - Theoretical SINR: " << *m_sinr);
-  NS_LOG_INFO ("SRS Frame - Calculated SINR: " << *calculatedSinr);
-  
-  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL (*calculatedSinr, *m_sinr, 0.0000001, "Data Frame - Wrong SINR !");
+  NS_LOG_INFO ("SRS Frame - Theoretical SINR: " << *m_expectedSinr);
+  NS_LOG_INFO ("SRS Frame - Calculated SINR: " << *m_actualSinr);
+
+  NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL (*m_actualSinr, *m_expectedSinr, 0.0000001, "Data Frame - Wrong SINR !");
   ulPhy->Dispose ();
   Simulator::Destroy ();
   
diff -Naur ns-3.22/src/lte/test/lte-test-uplink-sinr.h ns-3.23/src/lte/test/lte-test-uplink-sinr.h
--- ns-3.22/src/lte/test/lte-test-uplink-sinr.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/lte-test-uplink-sinr.h	2015-05-13 11:05:27.000000000 -0700
@@ -53,7 +53,7 @@
   Ptr<SpectrumValue> m_sv1;
   Ptr<SpectrumValue> m_sv2;
   Ptr<const SpectrumModel> m_sm;
-  Ptr<SpectrumValue> m_sinr;
+  Ptr<SpectrumValue> m_expectedSinr;
 };
 
 
@@ -63,13 +63,22 @@
     LteUplinkSrsSinrTestCase (Ptr<SpectrumValue> sv1, Ptr<SpectrumValue> sv2, Ptr<SpectrumValue> sinr, std::string name);
     virtual ~LteUplinkSrsSinrTestCase ();
     
-  private:
-    virtual void DoRun (void);
-    
-    Ptr<SpectrumValue> m_sv1;
-    Ptr<SpectrumValue> m_sv2;
-    Ptr<const SpectrumModel> m_sm;
-    Ptr<SpectrumValue> m_sinr;
+  /** 
+   * Callback to be connected to an LteChunkProcessor to collect the reported SINR
+   * 
+   * \param sinr 
+   */
+  void ReportSinr (const SpectrumValue& sinr);
+
+private:
+  virtual void DoRun (void);
+  
+  Ptr<SpectrumValue> m_sv1;
+  Ptr<SpectrumValue> m_sv2;
+  Ptr<const SpectrumModel> m_sm;
+  
+  Ptr<SpectrumValue> m_expectedSinr;
+  Ptr<SpectrumValue> m_actualSinr;
 };
 
 
diff -Naur ns-3.22/src/lte/test/test-lte-antenna.cc ns-3.23/src/lte/test/test-lte-antenna.cc
--- ns-3.22/src/lte/test/test-lte-antenna.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/test/test-lte-antenna.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,7 +37,8 @@
 
 #include "ns3/lte-global-pathloss-database.h"
 
-#include "lte-test-sinr-chunk-processor.h"
+#include <ns3/lte-chunk-processor.h>
+
 
 using namespace ns3;
 
@@ -148,11 +149,15 @@
   // Use testing chunk processor in the PHY layer
   // It will be used to test that the SNR is as intended
   Ptr<LtePhy> uePhy = ueDevs.Get (0)->GetObject<LteUeNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testDlSinr = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testDlSinr = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher dlSinrCatcher;
+  testDlSinr->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &dlSinrCatcher));
   uePhy->GetDownlinkSpectrumPhy ()->AddDataSinrChunkProcessor (testDlSinr);
 
   Ptr<LtePhy> enbphy = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ()->GetPhy ()->GetObject<LtePhy> ();
-  Ptr<LteTestSinrChunkProcessor> testUlSinr = Create<LteTestSinrChunkProcessor> ();
+  Ptr<LteChunkProcessor> testUlSinr = Create<LteChunkProcessor> ();
+  LteSpectrumValueCatcher ulSinrCatcher;
+  testUlSinr->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &ulSinrCatcher));
   enbphy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr);
 
 
@@ -177,15 +182,15 @@
   const double enbNoiseFigureDb = 5.0; // default eNB noise figure
   double tolerance = (m_antennaGainDb != 0) ? std::abs (m_antennaGainDb) * 0.001 : 0.001;
 
-  // first test with SINR from LteTestSinrChunkProcessor
+  // first test with SINR from LteChunkProcessor
   // this can only be done for not-too-bad SINR otherwise the measurement won't be available
   double expectedSinrDl = enbTxPowerDbm + m_antennaGainDb - noisePowerDbm + ueNoiseFigureDb;
   if (expectedSinrDl > 0)
     {
       double calculatedSinrDbDl = -INFINITY;
-      if (testDlSinr->GetSinr () != 0)
+      if (dlSinrCatcher.GetValue () != 0)
         {
-          calculatedSinrDbDl = 10.0 * std::log10 (testDlSinr->GetSinr ()->operator[] (0));
+          calculatedSinrDbDl = 10.0 * std::log10 (dlSinrCatcher.GetValue ()->operator[] (0));
         }      
       // remember that propagation loss is 0dB
       double calculatedAntennaGainDbDl = - (enbTxPowerDbm - calculatedSinrDbDl - noisePowerDbm - ueNoiseFigureDb);      
@@ -195,9 +200,9 @@
   if (expectedSinrUl > 0)
     {      
       double calculatedSinrDbUl = -INFINITY;
-      if (testUlSinr->GetSinr () != 0)
+      if (ulSinrCatcher.GetValue () != 0)
         {
-          calculatedSinrDbUl = 10.0 * std::log10 (testUlSinr->GetSinr ()->operator[] (0));
+          calculatedSinrDbUl = 10.0 * std::log10 (ulSinrCatcher.GetValue ()->operator[] (0));
         }  
       double calculatedAntennaGainDbUl = - (ueTxPowerDbm - calculatedSinrDbUl - noisePowerDbm - enbNoiseFigureDb);
       NS_TEST_ASSERT_MSG_EQ_TOL (calculatedAntennaGainDbUl, m_antennaGainDb, tolerance, "Wrong UL antenna gain!");
diff -Naur ns-3.22/src/lte/test/test-lte-rlc-header.cc ns-3.23/src/lte/test/test-lte-rlc-header.cc
--- ns-3.22/src/lte/test/test-lte-rlc-header.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/lte/test/test-lte-rlc-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -0,0 +1,225 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011, 2012, 2013 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Lluis Parcerisa <lparcerisa@cttc.cat> (TestUtils from test-asn1-encoding.cc)
+ *         Nicola Baldo <nbaldo@cttc.es> (actual test)
+ */
+
+#include "ns3/log.h"
+#include "ns3/test.h"
+#include "ns3/ptr.h"
+#include "ns3/packet.h"
+
+#include "ns3/lte-rlc-am-header.h"
+
+#include <list>
+#include <bitset>
+#include <iomanip>
+
+
+NS_LOG_COMPONENT_DEFINE ("TestLteRlcHeader");
+
+namespace ns3 {
+
+class TestUtils
+{
+public:
+  // Function to convert packet contents in hex format
+  static std::string sprintPacketContentsHex (Ptr<Packet> pkt)
+  {
+    uint32_t psize = pkt->GetSize ();
+    uint8_t buffer[psize];
+    std::ostringstream oss (std::ostringstream::out);
+    pkt->CopyData (buffer, psize);
+    for (uint32_t i = 0; i < psize; i++)
+      {
+        oss << std::setfill ('0') << std::setw (2) << std::hex << (uint32_t) buffer[i];
+      }
+    return oss.str ();
+  }
+
+  // Function to convert packet contents in binary format
+  static std::string sprintPacketContentsBin (Ptr<Packet> pkt)
+  {
+    uint32_t psize = pkt->GetSize ();
+    uint8_t buffer[psize];
+    std::ostringstream oss (std::ostringstream::out);
+    pkt->CopyData (buffer, psize);
+    for (uint32_t i = 0; i < psize; i++)
+      {
+        oss << (std::bitset<8> (buffer[i]));
+      }
+    return std::string (oss.str () + "\n");
+  }
+
+  // Function to log packet contents
+  static void LogPacketContents (Ptr<Packet> pkt)
+  {
+    NS_LOG_DEBUG ("---- SERIALIZED PACKET CONTENTS (HEX): -------");
+    NS_LOG_DEBUG ("Hex: " << TestUtils::sprintPacketContentsHex (pkt));
+    NS_LOG_DEBUG ("Bin: " << TestUtils::sprintPacketContentsBin (pkt));
+  }
+
+  template <class T>
+  static void LogPacketInfo (T source,std::string s)
+  {
+    NS_LOG_DEBUG ("--------- " << s.data () << " INFO: -------");
+    std::ostringstream oss (std::ostringstream::out);
+    source.Print (oss);
+    NS_LOG_DEBUG (oss.str ());
+  }
+};
+
+
+class RlcAmStatusPduTestCase : public TestCase
+{
+public:
+  RlcAmStatusPduTestCase (SequenceNumber10 ackSn, 
+			  std::list<SequenceNumber10> nackSnList,
+			  std::string hex);
+
+protected:  
+  virtual void DoRun (void);
+  
+  SequenceNumber10 m_ackSn;  
+  std::list<SequenceNumber10> m_nackSnList;
+  std::string m_hex;
+  
+};
+
+
+RlcAmStatusPduTestCase::RlcAmStatusPduTestCase (SequenceNumber10 ackSn, 
+						std::list<SequenceNumber10> nackSnList ,
+						std::string hex)
+  : TestCase (hex), 
+    m_ackSn (ackSn),
+    m_nackSnList (nackSnList),
+    m_hex (hex)
+{
+  NS_LOG_FUNCTION (this << hex);
+}
+
+void
+
+RlcAmStatusPduTestCase::DoRun ()
+{
+  NS_LOG_FUNCTION (this);
+  
+  Ptr<Packet> p = Create<Packet> ();
+  LteRlcAmHeader h;
+  h.SetControlPdu (LteRlcAmHeader::STATUS_PDU);
+  h.SetAckSn (m_ackSn);
+  for (std::list<SequenceNumber10>::iterator it = m_nackSnList.begin ();
+       it != m_nackSnList.end ();
+       ++it)
+    {
+      h.PushNack (it->GetValue ());
+    }
+  p->AddHeader (h);  
+
+  TestUtils::LogPacketContents (p);
+  std::string hex = TestUtils::sprintPacketContentsHex (p);
+  NS_TEST_ASSERT_MSG_EQ (m_hex, hex, "serialized packet content " << hex << " differs from test vector " << m_hex);
+  
+  LteRlcAmHeader h2;
+  p->RemoveHeader (h2);
+  SequenceNumber10 ackSn = h2.GetAckSn ();
+  NS_TEST_ASSERT_MSG_EQ (ackSn, m_ackSn, "deserialized ACK SN differs from test vector");
+  
+  for (std::list<SequenceNumber10>::iterator it = m_nackSnList.begin ();
+       it != m_nackSnList.end ();
+       ++it)
+    {
+      int nackSn = h2.PopNack ();
+      NS_TEST_ASSERT_MSG_GT (nackSn, -1, "not enough elements in deserialized NACK list");
+      NS_TEST_ASSERT_MSG_EQ (nackSn, it->GetValue (), "deserialized NACK SN  differs from test vector");
+    }
+  int retVal = h2.PopNack ();
+  NS_TEST_ASSERT_MSG_LT (retVal, 0, "too many elements in deserialized NACK list");
+}
+
+
+class LteRlcHeaderTestSuite : public TestSuite
+{
+public:
+  LteRlcHeaderTestSuite ();
+} staticLteRlcHeaderTestSuiteInstance ;
+
+LteRlcHeaderTestSuite::LteRlcHeaderTestSuite ()
+  : TestSuite ("lte-rlc-header", UNIT)
+{
+  NS_LOG_FUNCTION (this);
+
+  {
+    SequenceNumber10 ackSn (8);
+    std::list<SequenceNumber10> nackSnList;
+    std::string hex ("0020");
+    AddTestCase (new RlcAmStatusPduTestCase (ackSn, nackSnList, hex), TestCase::QUICK);
+  }
+
+  {
+    SequenceNumber10 ackSn (873);
+    std::list<SequenceNumber10> nackSnList;
+    std::string hex ("0da4");
+    AddTestCase (new RlcAmStatusPduTestCase (ackSn, nackSnList, hex), TestCase::QUICK);
+  }
+
+  {
+    SequenceNumber10 ackSn (2);
+    std::list<SequenceNumber10> nackSnList;
+    nackSnList.push_back (SequenceNumber10 (873));
+    std::string hex ("000bb480");
+    AddTestCase (new RlcAmStatusPduTestCase (ackSn, nackSnList, hex), TestCase::QUICK);
+  }
+
+
+  {
+    SequenceNumber10 ackSn (2);
+    std::list<SequenceNumber10> nackSnList;
+    nackSnList.push_back (SequenceNumber10 (1021));
+    nackSnList.push_back (SequenceNumber10 (754));
+    std::string hex ("000bfed790");
+    AddTestCase (new RlcAmStatusPduTestCase (ackSn, nackSnList, hex), TestCase::QUICK);
+  }
+
+
+  {
+    SequenceNumber10 ackSn (2);
+    std::list<SequenceNumber10> nackSnList;
+    nackSnList.push_back (SequenceNumber10 (1021));
+    nackSnList.push_back (SequenceNumber10 (754));
+    nackSnList.push_back (SequenceNumber10 (947));
+    std::string hex ("000bfed795d980");
+    AddTestCase (new RlcAmStatusPduTestCase (ackSn, nackSnList, hex), TestCase::QUICK);
+  }
+
+
+  {
+    SequenceNumber10 ackSn (2);
+    std::list<SequenceNumber10> nackSnList;
+    nackSnList.push_back (SequenceNumber10 (1021));
+    nackSnList.push_back (SequenceNumber10 (754));
+    nackSnList.push_back (SequenceNumber10 (947));
+    nackSnList.push_back (SequenceNumber10 (347));
+    std::string hex ("000bfed795d9cad8");
+    AddTestCase (new RlcAmStatusPduTestCase (ackSn, nackSnList, hex), TestCase::QUICK);
+  }
+
+}
+
+
+} // namespace ns3
diff -Naur ns-3.22/src/lte/wscript ns-3.23/src/lte/wscript
--- ns-3.22/src/lte/wscript	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/lte/wscript	2015-05-13 11:05:27.000000000 -0700
@@ -129,7 +129,6 @@
         'test/lte-test-uplink-sinr.cc',
         'test/lte-test-link-adaptation.cc',
         'test/lte-test-interference.cc',
-        'test/lte-test-sinr-chunk-processor.cc',
         'test/lte-test-ue-phy.cc',
         'test/lte-test-rr-ff-mac-scheduler.cc',
         'test/lte-test-pf-ff-mac-scheduler.cc',
@@ -148,6 +147,7 @@
         'test/lte-test-entities.cc',
         'test/lte-simple-helper.cc',
         'test/lte-simple-net-device.cc',
+        'test/test-lte-rlc-header.cc',
         'test/lte-test-rlc-um-transmitter.cc',
         'test/lte-test-rlc-am-transmitter.cc',
         'test/lte-test-rlc-um-e2e.cc',
diff -Naur ns-3.22/src/mesh/bindings/modulegen__gcc_ILP32.py ns-3.23/src/mesh/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/mesh/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -251,17 +251,13 @@
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader [class]
     module.add_class('WifiActionHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::CategoryValue [enumeration]
-    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH_PEERING_MGT', 'MESH_LINK_METRIC', 'MESH_PATH_SELECTION', 'MESH_INTERWORKING', 'MESH_RESOURCE_COORDINATION', 'MESH_PROXY_FORWARDING', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PeerLinkMgtActionValue [enumeration]
-    module.add_enum('PeerLinkMgtActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::LinkMetricActionValue [enumeration]
-    module.add_enum('LinkMetricActionValue', ['LINK_METRIC_REQUEST', 'LINK_METRIC_REPORT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PathSelectionActionValue [enumeration]
-    module.add_enum('PathSelectionActionValue', ['PATH_SELECTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::InterworkActionValue [enumeration]
-    module.add_enum('InterworkActionValue', ['PORTAL_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ResourceCoordinationActionValue [enumeration]
-    module.add_enum('ResourceCoordinationActionValue', ['CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'BEACON_TIMING_REQUEST', 'BEACON_TIMING_RESPONSE', 'TBTT_ADJUSTMENT_REQUEST', 'MESH_CHANNEL_SWITCH_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH', 'MULTIHOP', 'SELF_PROTECTED', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::SelfProtectedActionValue [enumeration]
+    module.add_enum('SelfProtectedActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE', 'GROUP_KEY_INFORM', 'GROUP_KEY_ACK'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MultihopActionValue [enumeration]
+    module.add_enum('MultihopActionValue', ['PROXY_UPDATE', 'PROXY_UPDATE_CONFIRMATION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MeshActionValue [enumeration]
+    module.add_enum('MeshActionValue', ['LINK_METRIC_REPORT', 'PATH_SELECTION', 'PORTAL_ANNOUNCEMENT', 'CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'TBTT_ADJUSTMENT_REQUEST', 'TBTT_ADJUSTMENT_RESPONSE'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::BlockAckActionValue [enumeration]
     module.add_enum('BlockAckActionValue', ['BLOCK_ACK_ADDBA_REQUEST', 'BLOCK_ACK_ADDBA_RESPONSE', 'BLOCK_ACK_DELBA'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue [union]
@@ -507,7 +503,7 @@
     ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sCongestionControlMode [enumeration]
     module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])
     ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
-    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
+    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE', 'AUTH_IEEE'])
     ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionMetric [enumeration]
     module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
     ## ie-dot11s-peer-management.h (module 'mesh'): ns3::dot11s::PmpReasonCode [enumeration]
@@ -4986,16 +4982,12 @@
     cls.add_constructor([param('ns3::WifiActionHeader::ActionValue const &', 'arg0')])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::blockAck [variable]
     cls.add_instance_attribute('blockAck', 'ns3::WifiActionHeader::BlockAckActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::interwork [variable]
-    cls.add_instance_attribute('interwork', 'ns3::WifiActionHeader::InterworkActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::linkMetrtic [variable]
-    cls.add_instance_attribute('linkMetrtic', 'ns3::WifiActionHeader::LinkMetricActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::pathSelection [variable]
-    cls.add_instance_attribute('pathSelection', 'ns3::WifiActionHeader::PathSelectionActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::peerLink [variable]
-    cls.add_instance_attribute('peerLink', 'ns3::WifiActionHeader::PeerLinkMgtActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::resourceCoordination [variable]
-    cls.add_instance_attribute('resourceCoordination', 'ns3::WifiActionHeader::ResourceCoordinationActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::meshAction [variable]
+    cls.add_instance_attribute('meshAction', 'ns3::WifiActionHeader::MeshActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::multihopAction [variable]
+    cls.add_instance_attribute('multihopAction', 'ns3::WifiActionHeader::MultihopActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::selfProtectedAction [variable]
+    cls.add_instance_attribute('selfProtectedAction', 'ns3::WifiActionHeader::SelfProtectedActionValue', is_const=False)
     return
 
 def register_Ns3WifiInformationElement_methods(root_module, cls):
@@ -5791,6 +5783,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -6264,10 +6260,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -6441,10 +6437,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiMode,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiTxVector,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
@@ -10222,15 +10218,15 @@
                    'uint8_t', 
                    [], 
                    is_const=True)
-    ## ie-dot11s-configuration.h (module 'mesh'): uint16_t ns3::dot11s::Dot11sMeshCapability::GetUint16() const [member function]
-    cls.add_method('GetUint16', 
-                   'uint16_t', 
+    ## ie-dot11s-configuration.h (module 'mesh'): uint8_t ns3::dot11s::Dot11sMeshCapability::GetUint8() const [member function]
+    cls.add_method('GetUint8', 
+                   'uint8_t', 
                    [], 
                    is_const=True)
-    ## ie-dot11s-configuration.h (module 'mesh'): bool ns3::dot11s::Dot11sMeshCapability::Is(uint16_t cap, uint8_t n) const [member function]
+    ## ie-dot11s-configuration.h (module 'mesh'): bool ns3::dot11s::Dot11sMeshCapability::Is(uint8_t cap, uint8_t n) const [member function]
     cls.add_method('Is', 
                    'bool', 
-                   [param('uint16_t', 'cap'), param('uint8_t', 'n')], 
+                   [param('uint8_t', 'cap'), param('uint8_t', 'n')], 
                    is_const=True)
     ## ie-dot11s-configuration.h (module 'mesh'): ns3::Buffer::Iterator ns3::dot11s::Dot11sMeshCapability::Serialize(ns3::Buffer::Iterator i) const [member function]
     cls.add_method('Serialize', 
diff -Naur ns-3.22/src/mesh/bindings/modulegen__gcc_LP64.py ns-3.23/src/mesh/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/mesh/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -251,17 +251,13 @@
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader [class]
     module.add_class('WifiActionHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::CategoryValue [enumeration]
-    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH_PEERING_MGT', 'MESH_LINK_METRIC', 'MESH_PATH_SELECTION', 'MESH_INTERWORKING', 'MESH_RESOURCE_COORDINATION', 'MESH_PROXY_FORWARDING', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PeerLinkMgtActionValue [enumeration]
-    module.add_enum('PeerLinkMgtActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::LinkMetricActionValue [enumeration]
-    module.add_enum('LinkMetricActionValue', ['LINK_METRIC_REQUEST', 'LINK_METRIC_REPORT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PathSelectionActionValue [enumeration]
-    module.add_enum('PathSelectionActionValue', ['PATH_SELECTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::InterworkActionValue [enumeration]
-    module.add_enum('InterworkActionValue', ['PORTAL_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ResourceCoordinationActionValue [enumeration]
-    module.add_enum('ResourceCoordinationActionValue', ['CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'BEACON_TIMING_REQUEST', 'BEACON_TIMING_RESPONSE', 'TBTT_ADJUSTMENT_REQUEST', 'MESH_CHANNEL_SWITCH_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH', 'MULTIHOP', 'SELF_PROTECTED', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::SelfProtectedActionValue [enumeration]
+    module.add_enum('SelfProtectedActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE', 'GROUP_KEY_INFORM', 'GROUP_KEY_ACK'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MultihopActionValue [enumeration]
+    module.add_enum('MultihopActionValue', ['PROXY_UPDATE', 'PROXY_UPDATE_CONFIRMATION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MeshActionValue [enumeration]
+    module.add_enum('MeshActionValue', ['LINK_METRIC_REPORT', 'PATH_SELECTION', 'PORTAL_ANNOUNCEMENT', 'CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'TBTT_ADJUSTMENT_REQUEST', 'TBTT_ADJUSTMENT_RESPONSE'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::BlockAckActionValue [enumeration]
     module.add_enum('BlockAckActionValue', ['BLOCK_ACK_ADDBA_REQUEST', 'BLOCK_ACK_ADDBA_RESPONSE', 'BLOCK_ACK_DELBA'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue [union]
@@ -505,7 +501,7 @@
     ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sCongestionControlMode [enumeration]
     module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])
     ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
-    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
+    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE', 'AUTH_IEEE'])
     ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionMetric [enumeration]
     module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
     ## ie-dot11s-peer-management.h (module 'mesh'): ns3::dot11s::PmpReasonCode [enumeration]
@@ -4986,16 +4982,12 @@
     cls.add_constructor([param('ns3::WifiActionHeader::ActionValue const &', 'arg0')])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::blockAck [variable]
     cls.add_instance_attribute('blockAck', 'ns3::WifiActionHeader::BlockAckActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::interwork [variable]
-    cls.add_instance_attribute('interwork', 'ns3::WifiActionHeader::InterworkActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::linkMetrtic [variable]
-    cls.add_instance_attribute('linkMetrtic', 'ns3::WifiActionHeader::LinkMetricActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::pathSelection [variable]
-    cls.add_instance_attribute('pathSelection', 'ns3::WifiActionHeader::PathSelectionActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::peerLink [variable]
-    cls.add_instance_attribute('peerLink', 'ns3::WifiActionHeader::PeerLinkMgtActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::resourceCoordination [variable]
-    cls.add_instance_attribute('resourceCoordination', 'ns3::WifiActionHeader::ResourceCoordinationActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::meshAction [variable]
+    cls.add_instance_attribute('meshAction', 'ns3::WifiActionHeader::MeshActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::multihopAction [variable]
+    cls.add_instance_attribute('multihopAction', 'ns3::WifiActionHeader::MultihopActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::selfProtectedAction [variable]
+    cls.add_instance_attribute('selfProtectedAction', 'ns3::WifiActionHeader::SelfProtectedActionValue', is_const=False)
     return
 
 def register_Ns3WifiInformationElement_methods(root_module, cls):
@@ -5791,6 +5783,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -6264,10 +6260,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -6441,10 +6437,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiMode,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiTxVector,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
@@ -10222,15 +10218,15 @@
                    'uint8_t', 
                    [], 
                    is_const=True)
-    ## ie-dot11s-configuration.h (module 'mesh'): uint16_t ns3::dot11s::Dot11sMeshCapability::GetUint16() const [member function]
-    cls.add_method('GetUint16', 
-                   'uint16_t', 
+    ## ie-dot11s-configuration.h (module 'mesh'): uint8_t ns3::dot11s::Dot11sMeshCapability::GetUint8() const [member function]
+    cls.add_method('GetUint8', 
+                   'uint8_t', 
                    [], 
                    is_const=True)
-    ## ie-dot11s-configuration.h (module 'mesh'): bool ns3::dot11s::Dot11sMeshCapability::Is(uint16_t cap, uint8_t n) const [member function]
+    ## ie-dot11s-configuration.h (module 'mesh'): bool ns3::dot11s::Dot11sMeshCapability::Is(uint8_t cap, uint8_t n) const [member function]
     cls.add_method('Is', 
                    'bool', 
-                   [param('uint16_t', 'cap'), param('uint8_t', 'n')], 
+                   [param('uint8_t', 'cap'), param('uint8_t', 'n')], 
                    is_const=True)
     ## ie-dot11s-configuration.h (module 'mesh'): ns3::Buffer::Iterator ns3::dot11s::Dot11sMeshCapability::Serialize(ns3::Buffer::Iterator i) const [member function]
     cls.add_method('Serialize', 
diff -Naur ns-3.22/src/mesh/doc/mesh.rst ns-3.23/src/mesh/doc/mesh.rst
--- ns-3.22/src/mesh/doc/mesh.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/doc/mesh.rst	2015-05-13 11:05:27.000000000 -0700
@@ -8,3 +8,9 @@
 The Mesh NetDevice based on 802.11s was added in *ns-3.6*. An overview
 presentation by Kirill Andreev was published at the wns-3 workshop
 in 2009: `<http://www.nsnam.org/wiki/Wns3-2009>`_.
+
+An overview paper is available at:
+`<https://www.nsnam.org/workshops/wns3-2010/dot11s.pdf>`_.
+
+As of ns-3.23 release, the model has been slightly updated to the 802.11s-2012
+standard with regard to packet formats.
diff -Naur ns-3.22/src/mesh/model/dot11s/airtime-metric.cc ns-3.23/src/mesh/model/dot11s/airtime-metric.cc
--- ns-3.22/src/mesh/model/dot11s/airtime-metric.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/airtime-metric.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::AirtimeLinkMetricCalculator")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<AirtimeLinkMetricCalculator> ()
     .AddAttribute ( "TestLength",
                     "Rate should be estimated using test length.",
diff -Naur ns-3.22/src/mesh/model/dot11s/dot11s-mac-header.cc ns-3.23/src/mesh/model/dot11s/dot11s-mac-header.cc
--- ns-3.22/src/mesh/model/dot11s/dot11s-mac-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/dot11s-mac-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::Dot11sMacHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<MeshHeader> ();
   return tid;
 }
diff -Naur ns-3.22/src/mesh/model/dot11s/hwmp-protocol.cc ns-3.23/src/mesh/model/dot11s/hwmp-protocol.cc
--- ns-3.22/src/mesh/model/dot11s/hwmp-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/hwmp-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::HwmpProtocol")
     .SetParent<MeshL2RoutingProtocol> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<HwmpProtocol> ()
     .AddAttribute ( "RandomStart",
                     "Random delay at first proactive PREQ",
@@ -209,7 +210,8 @@
   m_coefficient->SetAttribute ("Max", DoubleValue (m_randomStart.GetSeconds ()));
   if (m_isRoot)
     {
-      SetRoot ();
+      Time randomStart = Seconds (m_coefficient->GetValue ());
+      m_proactivePreqTimer = Simulator::Schedule (randomStart, &HwmpProtocol::SendProactivePreq, this);
     }
 }
 
@@ -1026,8 +1028,6 @@
 void
 HwmpProtocol::SetRoot ()
 {
-  Time randomStart = Seconds (m_coefficient->GetValue ());
-  m_proactivePreqTimer = Simulator::Schedule (randomStart, &HwmpProtocol::SendProactivePreq, this);
   NS_LOG_DEBUG ("ROOT IS: " << m_address);
   m_isRoot = true;
 }
diff -Naur ns-3.22/src/mesh/model/dot11s/hwmp-protocol.h ns-3.23/src/mesh/model/dot11s/hwmp-protocol.h
--- ns-3.22/src/mesh/model/dot11s/hwmp-protocol.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/hwmp-protocol.h	2015-05-13 11:05:27.000000000 -0700
@@ -156,7 +156,7 @@
   /// \return list of addresses where a PERR should be sent to
   std::vector<std::pair<uint32_t, Mac48Address> > GetPerrReceivers (std::vector<FailedDestination> failedDest);
 
-  /// \return list of addresses where a PERR should be sent to
+  /// \return list of addresses where a PREQ should be sent to
   std::vector<Mac48Address> GetPreqReceivers (uint32_t interface);
   /// \return list of addresses where a broadcast should be
   //retransmitted
diff -Naur ns-3.22/src/mesh/model/dot11s/hwmp-protocol-mac.cc ns-3.23/src/mesh/model/dot11s/hwmp-protocol-mac.cc
--- ns-3.22/src/mesh/model/dot11s/hwmp-protocol-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/hwmp-protocol-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -99,7 +99,7 @@
   m_stats.rxMgtBytes += packet->GetSize ();
   WifiActionHeader actionHdr;
   packet->RemoveHeader (actionHdr);
-  if (actionHdr.GetCategory () != WifiActionHeader::MESH_PATH_SELECTION)
+  if (actionHdr.GetCategory () != WifiActionHeader::MESH)
     {
       return true;
     }
@@ -210,8 +210,8 @@
 {
   WifiActionHeader actionHdr;
   WifiActionHeader::ActionValue action;
-  action.pathSelection = WifiActionHeader::PATH_SELECTION;
-  actionHdr.SetAction (WifiActionHeader::MESH_PATH_SELECTION, action);
+  action.meshAction = WifiActionHeader::PATH_SELECTION;
+  actionHdr.SetAction (WifiActionHeader::MESH, action); 
   return actionHdr;
 }
 void
diff -Naur ns-3.22/src/mesh/model/dot11s/hwmp-rtable.cc ns-3.23/src/mesh/model/dot11s/hwmp-rtable.cc
--- ns-3.22/src/mesh/model/dot11s/hwmp-rtable.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/hwmp-rtable.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::HwmpRtable")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<HwmpRtable> ();
   return tid;
 }
diff -Naur ns-3.22/src/mesh/model/dot11s/hwmp-tag.cc ns-3.23/src/mesh/model/dot11s/hwmp-tag.cc
--- ns-3.22/src/mesh/model/dot11s/hwmp-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/hwmp-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -86,7 +86,7 @@
 TypeId
 HwmpTag::GetTypeId ()
 {
-  static TypeId tid = TypeId ("ns3::dot11s::HwmpTag").SetParent<Tag> ().AddConstructor<HwmpTag> ();
+  static TypeId tid = TypeId ("ns3::dot11s::HwmpTag").SetParent<Tag> ().AddConstructor<HwmpTag> ().SetGroupName ("Mesh");
   return tid;
 }
 
diff -Naur ns-3.22/src/mesh/model/dot11s/ie-dot11s-configuration.cc ns-3.23/src/mesh/model/dot11s/ie-dot11s-configuration.cc
--- ns-3.22/src/mesh/model/dot11s/ie-dot11s-configuration.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/ie-dot11s-configuration.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,17 +32,17 @@
 uint8_t
 Dot11sMeshCapability::GetSerializedSize () const
 {
-  return 2;
+  return 1; 
 }
-uint16_t
-Dot11sMeshCapability::GetUint16 () const
+uint8_t  
+Dot11sMeshCapability::GetUint8 () const  //IEEE 802.11-2012 8.4.2.100.8 Mesh Capability 
 {
-  uint16_t result = 0;
+  uint8_t result = 0;  
   if (acceptPeerLinks)
     {
-      result |= 1 << 0;
+      result |= 1 << 0; //The Accepting Additional Mesh Peerings subfield is set to 1 if the mesh STA is willing to establish additional mesh peerings   with other mesh STAs and set to 0 otherwise
     }
-  if (MCCASupported)
+  if (MCCASupported) // The MCCA Supported subfield is set to 1 if the mesh STA implements MCCA and set to 0 otherwise
     {
       result |= 1 << 1;
     }
@@ -71,13 +71,13 @@
 Buffer::Iterator
 Dot11sMeshCapability::Serialize (Buffer::Iterator i) const
 {
-  i.WriteHtolsbU16 (GetUint16 ());
+  i.WriteU8 (GetUint8 ());
   return i;
 }
 Buffer::Iterator
 Dot11sMeshCapability::Deserialize (Buffer::Iterator i)
 {
-  uint16_t cap = i.ReadLsbtohU16 ();
+  uint8_t cap = i.ReadU8 ();
   acceptPeerLinks = Is (cap, 0);
   MCCASupported = Is (cap, 1);
   MCCAEnabled = Is (cap, 2);
@@ -88,7 +88,7 @@
   return i;
 }
 bool
-Dot11sMeshCapability::Is (uint16_t cap, uint8_t n) const
+Dot11sMeshCapability::Is (uint8_t cap, uint8_t n) const
 {
   uint16_t mask = 1 << n;
   return (cap & mask);
@@ -107,29 +107,28 @@
 uint8_t
 IeConfiguration::GetInformationFieldSize () const
 {
-  return 1 // Version
-         + 4 // APSPId
-         + 4 // APSMId
-         + 4 // CCMId
-         + 4 // SPId
-         + 4 // APId
+   return 0   // Version
+         + 1  // APSPId
+         + 1 // APSMId
+         + 1 // CCMId
+         + 1 // SPId
+         + 1 // APId
          + 1 // Mesh formation info (see 7.3.2.86.6 of 802.11s draft 3.0)
          + m_meshCap.GetSerializedSize ();
 }
 void
 IeConfiguration::SerializeInformationField (Buffer::Iterator i) const
 {
-  i.WriteU8 (1); //Version
   // Active Path Selection Protocol ID:
-  i.WriteHtolsbU32 (m_APSPId);
+  i.WriteU8 (m_APSPId);
   // Active Path Metric ID:
-  i.WriteHtolsbU32 (m_APSMId);
+  i.WriteU8 (m_APSMId);
   // Congestion Control Mode ID:
-  i.WriteHtolsbU32 (m_CCMId);
+  i.WriteU8 (m_CCMId);
   // Sync:
-  i.WriteHtolsbU32 (m_SPId);
+  i.WriteU8 (m_SPId);
   // Auth:
-  i.WriteHtolsbU32 (m_APId);
+  i.WriteU8 (m_APId);
   i.WriteU8 (m_neighbors << 1);
   m_meshCap.Serialize (i);
 }
@@ -137,20 +136,14 @@
 IeConfiguration::DeserializeInformationField (Buffer::Iterator i, uint8_t length)
 {
   Buffer::Iterator start = i;
-  uint8_t version;
-  version = i.ReadU8 ();
-  if (version != 1)
-    {
-      NS_FATAL_ERROR ("Other versions not supported yet");
-    }
   // Active Path Selection Protocol ID:
-  m_APSPId = (dot11sPathSelectionProtocol) i.ReadLsbtohU32 ();
+  m_APSPId = (dot11sPathSelectionProtocol) i.ReadU8 ();
   // Active Path Metric ID:
-  m_APSMId = (dot11sPathSelectionMetric) i.ReadLsbtohU32 ();
+  m_APSMId = (dot11sPathSelectionMetric) i.ReadU8 ();
   // Congestion Control Mode ID:
-  m_CCMId = (dot11sCongestionControlMode) i.ReadLsbtohU32 ();
-  m_SPId = (dot11sSynchronizationProtocolIdentifier) i.ReadLsbtohU32 ();
-  m_APId = (dot11sAuthenticationProtocol) i.ReadLsbtohU32 ();
+  m_CCMId = (dot11sCongestionControlMode) i.ReadU8 ();
+  m_SPId = (dot11sSynchronizationProtocolIdentifier) i.ReadU8 ();
+  m_APId = (dot11sAuthenticationProtocol) i.ReadU8 ();
   m_neighbors = (i.ReadU8 () >> 1) & 0xF;
   i = m_meshCap.Deserialize (i);
   return i.GetDistanceFrom (start);
@@ -165,7 +158,7 @@
      << std::endl << "Congestion Control Mode ID:        = " << (uint32_t) m_CCMId
      << std::endl << "Synchronize protocol ID:           = " << (uint32_t) m_SPId
      << std::endl << "Authentication protocol ID:        = " << (uint32_t) m_APId
-     << std::endl << "Capabilities:                      = " << m_meshCap.GetUint16 () << std::endl;
+     << std::endl << "Capabilities:                      = " << m_meshCap.GetUint8 () << std::endl;
   os << "</information_element>" << std::endl;
 }
 void
diff -Naur ns-3.22/src/mesh/model/dot11s/ie-dot11s-configuration.h ns-3.23/src/mesh/model/dot11s/ie-dot11s-configuration.h
--- ns-3.22/src/mesh/model/dot11s/ie-dot11s-configuration.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/ie-dot11s-configuration.h	2015-05-13 11:05:27.000000000 -0700
@@ -27,48 +27,41 @@
 
 namespace ns3 {
 namespace dot11s {
-/**
- * \ingroup dot11s
- * \brief See 7.3.2.86.1 in 802.11s draft 3.0
- */
+ 
+//according to IEEE 802.11 - 2012
+
+//in 7.3.2.98.2 Active Path Selection Protocol Identifier - 802.11s-2011 
 enum dot11sPathSelectionProtocol
 {
-  PROTOCOL_HWMP = 0x000fac00,
+  PROTOCOL_HWMP = 0x01,
 };
-/**
- * \ingroup dot11s
- * \brief See 7.3.2.86.2 in 802.11s draft 3.0
- */
+ 
+//in 7.3.2.98.3 Active Path Selection Metric Identifier - 802.11s-2011 
 enum dot11sPathSelectionMetric
 {
-  METRIC_AIRTIME = 0x000fac00,
+  METRIC_AIRTIME = 0x01,
 };
-/**
- * \ingroup dot11s
- * \brief See 7.3.2.86.3 in 802.11s draft 3.0
- */
+
+// in 7.3.2.98.4 Congestion Control Mode Identifier - 802.11s-2011 
 enum dot11sCongestionControlMode
 {
-  CONGESTION_SIGNALING = 0x000fac00,
-  CONGESTION_NULL      = 0x000facff,
+  CONGESTION_SIGNALING = 0x01,
+  CONGESTION_NULL      = 0x00,
 };
-/**
- * \ingroup dot11s
- * \brief See 7.3.2.86.4 in 802.11s draft 3.0
- */
+
+// in 7.3.2.98.5 Synchronization Method Identifier - 802.11s-2011 
 enum dot11sSynchronizationProtocolIdentifier
 {
-  SYNC_NEIGHBOUR_OFFSET = 0x000fac00,
-  SYNC_NULL             = 0x000facff,
+  SYNC_NEIGHBOUR_OFFSET = 0x01,  //Neighbor offset synchronization method
+  SYNC_NULL             = 0x00,  //Reserved
 };
-/**
- * \ingroup dot11s
- * \brief See 7.3.2.86.5 in 802.11s draft 3.0
- */
+
+// in 7.3.2.98.6 Authentication Protocol Identifier - 802.11s-2011 
 enum dot11sAuthenticationProtocol
 {
-  AUTH_NULL = 0x000fac00,
-  AUTH_SAE  = 0x000fac01,
+  AUTH_NULL = 0x00,  //No authentication method is required to establish mesh peerings within the MBSS
+  AUTH_SAE  = 0x01,  //SAE defined in 8.2a
+  AUTH_IEEE = 0x02,  //IEEE 802.1X authentication
 };
 /**
  * \ingroup dot11s
@@ -81,7 +74,7 @@
   uint8_t  GetSerializedSize () const;
   Buffer::Iterator Serialize (Buffer::Iterator i) const;
   Buffer::Iterator Deserialize (Buffer::Iterator i);
-  uint16_t GetUint16 () const;
+  uint8_t GetUint8 () const;  
   bool acceptPeerLinks;
   bool MCCASupported;
   bool MCCAEnabled;
@@ -89,7 +82,7 @@
   bool beaconTimingReport;
   bool TBTTAdjustment;
   bool powerSaveLevel;
-  bool Is (uint16_t cap,uint8_t n) const;
+  bool Is (uint8_t cap,uint8_t n) const;
   friend bool operator== (const Dot11sMeshCapability & a, const Dot11sMeshCapability & b);
 };
 
diff -Naur ns-3.22/src/mesh/model/dot11s/ie-dot11s-peer-management.h ns-3.23/src/mesh/model/dot11s/ie-dot11s-peer-management.h
--- ns-3.22/src/mesh/model/dot11s/ie-dot11s-peer-management.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/ie-dot11s-peer-management.h	2015-05-13 11:05:27.000000000 -0700
@@ -33,31 +33,30 @@
  */
 enum PmpReasonCode
 {
-  REASON11S_PEERING_CANCELLED = 2, // according to open80211s
-  REASON11S_MESH_MAX_PEERS,
-  REASON11S_MESH_CAPABILITY_POLICY_VIOLATION,
-  REASON11S_MESH_CLOSE_RCVD,
-  REASON11S_MESH_MAX_RETRIES,
-  REASON11S_MESH_CONFIRM_TIMEOUT,
-  REASON11S_MESH_INVALID_GTK,
-  REASON11S_MESH_INCONSISTENT_PARAMETERS,
-  REASON11S_MESH_INVALID_SECURITY_CAPABILITY,
-  REASON11S_RESERVED,
+  REASON11S_PEERING_CANCELLED = 52, // according to IEEE 802.11 - 2012
+  REASON11S_MESH_MAX_PEERS = 53,
+  REASON11S_MESH_CAPABILITY_POLICY_VIOLATION = 54,
+  REASON11S_MESH_CLOSE_RCVD = 55,
+  REASON11S_MESH_MAX_RETRIES = 56,
+  REASON11S_MESH_CONFIRM_TIMEOUT = 57,
+  REASON11S_MESH_INVALID_GTK = 58,
+  REASON11S_MESH_INCONSISTENT_PARAMETERS = 59,
+  REASON11S_MESH_INVALID_SECURITY_CAPABILITY =60,
+  REASON11S_RESERVED = 67,
 };
 
-/**
- * \ingroup dot11s
- * \brief See 7.3.2.85 of draft 2.07
- */
+
+// according to IEEE 802.11 - 2012
+
 class IePeerManagement : public WifiInformationElement
 {
 public:
   IePeerManagement ();
   enum Subtype
   {
-    PEER_OPEN = 0,
-    PEER_CONFIRM,
-    PEER_CLOSE,
+    PEER_OPEN = 1,
+    PEER_CONFIRM = 2,
+    PEER_CLOSE = 3,
   };
   void   SetPeerOpen (uint16_t localLinkId);
   void   SetPeerClose (uint16_t localLinkID, uint16_t peerLinkId, PmpReasonCode reasonCode);
diff -Naur ns-3.22/src/mesh/model/dot11s/ie-dot11s-perr.cc ns-3.23/src/mesh/model/dot11s/ie-dot11s-perr.cc
--- ns-3.22/src/mesh/model/dot11s/ie-dot11s-perr.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/ie-dot11s-perr.cc	2015-05-13 11:05:27.000000000 -0700
@@ -54,28 +54,33 @@
 void
 IePerr::SerializeInformationField (Buffer::Iterator i) const
 {
-  i.WriteU8 (0);
-  i.WriteU8 (m_addressUnits.size ());
+  i.WriteU8 (0);// TTL
+  i.WriteU8 (m_addressUnits.size ()); // number of Destinations
   for (unsigned int j = 0; j < m_addressUnits.size (); j++)
     {
+      i.WriteU8 (0); // not used // Bit 6: AE (Address Extension) subfield (1 = destination external address is present, 0 = otherwise).
       WriteTo (i, m_addressUnits[j].destination);
       i.WriteHtolsbU32 (m_addressUnits[j].seqnum);
+      i.WriteU8 (0);
+      i.WriteU8 (0);
     }
 }
 uint8_t
 IePerr::DeserializeInformationField (Buffer::Iterator start, uint8_t length)
 {
   Buffer::Iterator i = start;
-  i.Next (1); //Mode flags is not used now
+  i.Next (1); //TTL //Mode flags is not used now
   uint8_t numOfDest = i.ReadU8 ();
-  NS_ASSERT ((2 + 10 * numOfDest ) == length);
+  NS_ASSERT ((2 + 13 * numOfDest ) == length);
   length = 0; //to avoid compiler warning in optimized builds
   for (unsigned int j = 0; j < numOfDest; j++)
     {
+      i.Next (1); // flags is not used now
       HwmpProtocol::FailedDestination unit;
       ReadFrom (i, unit.destination);
       unit.seqnum = i.ReadLsbtohU32 ();
       m_addressUnits.push_back (unit);
+      i.Next (2); // Reason
     }
   return i.GetDistanceFrom (start);
 }
@@ -83,9 +88,11 @@
 uint8_t
 IePerr::GetInformationFieldSize () const
 {
-  uint8_t retval = 1 //ModeFlags
+  uint8_t retval = 1 //TTL   //ModeFlags
     + 1   //NumOfDests
-    + (6 + 4) * m_addressUnits.size ();
+    + 1  * m_addressUnits.size () //ModeFlags
+    + (6 + 4) * m_addressUnits.size ()
+    + 2* m_addressUnits.size (); // Reason Code
   return retval;
 }
 
@@ -99,7 +106,7 @@
           return;
         }
     }
-  if ((m_addressUnits.size () + 1) * 10 + 2 > 255)
+ if ((m_addressUnits.size () + 1) * 13 + 2 > 255)
     {
       return;
     }
@@ -112,7 +119,7 @@
   return (GetInformationFieldSize ()
           > 255
           -   2 /* ID + LENGTH*/
-          -  10 /* Size of Mac48Address + uint32_t (one unit)*/
+          -  13// 10 /* Size of Mac48Address + uint32_t (one unit)*/
           );
 }
 std::vector<HwmpProtocol::FailedDestination>
diff -Naur ns-3.22/src/mesh/model/dot11s/peer-link.cc ns-3.23/src/mesh/model/dot11s/peer-link.cc
--- ns-3.22/src/mesh/model/dot11s/peer-link.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/peer-link.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::PeerLink")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<PeerLink> ()
     .AddAttribute ( "RetryTimeout",
                     "Retry timeout",
diff -Naur ns-3.22/src/mesh/model/dot11s/peer-link-frame.cc ns-3.23/src/mesh/model/dot11s/peer-link-frame.cc
--- ns-3.22/src/mesh/model/dot11s/peer-link-frame.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/peer-link-frame.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,7 +30,7 @@
 
 PeerLinkFrameStart::PeerLinkFrameStart () :
   m_subtype (255), m_capability (0), m_aid (0), m_rates (SupportedRates ()), m_meshId (),
-  m_config (IeConfiguration ()), m_reasonCode ((uint16_t)REASON11S_RESERVED)
+  m_config (IeConfiguration ())
 {
 }
 void
@@ -42,7 +42,7 @@
 PeerLinkFrameStart::SetPlinkFrameStart (PeerLinkFrameStart::PlinkFrameStartFields fields)
 {
   m_subtype = fields.subtype;
-  m_protocol = fields.protocol;
+  
   if (m_subtype != (uint8_t)(WifiActionHeader::PEER_LINK_CLOSE))
     {
       m_capability = fields.capability;
@@ -65,7 +65,7 @@
     }
   else
     {
-      m_reasonCode = fields.reasonCode;
+      //reasonCode not used here
     }
 }
 PeerLinkFrameStart::PlinkFrameStartFields
@@ -79,14 +79,17 @@
   retval.rates = m_rates;
   retval.meshId = m_meshId;
   retval.config = m_config;
-  retval.reasonCode = m_reasonCode;
+  
   return retval;
 }
 TypeId
 PeerLinkFrameStart::GetTypeId ()
 {
-  static TypeId tid = TypeId ("ns3::dot11s::PeerLinkFrameStart").SetParent<Header> ().AddConstructor<
-      PeerLinkFrameStart> ();
+  static TypeId tid = TypeId ("ns3::dot11s::PeerLinkFrameStart")
+    .SetParent<Header> ()
+    .SetGroupName ("Mesh")
+    .AddConstructor<PeerLinkFrameStart> ()
+  ;
   return tid;
 }
 TypeId
@@ -107,8 +110,8 @@
 uint32_t
 PeerLinkFrameStart::GetSerializedSize () const
 {
-  uint32_t size = 3; //Peering protocol
-  NS_ASSERT (m_subtype < 3);
+  uint32_t size =0; //Peering protocol
+  NS_ASSERT (m_subtype < 4);
   if ((uint8_t)(WifiActionHeader::PEER_LINK_CLOSE) != m_subtype)
     {
       size += 2; //capability
@@ -132,7 +135,7 @@
     }
   else
     {
-      size += 2; //reasonCode
+      //reasonCode not used here
     }
   return size;
 }
@@ -140,8 +143,8 @@
 PeerLinkFrameStart::Serialize (Buffer::Iterator start) const
 {
   Buffer::Iterator i = start;
-  NS_ASSERT (m_subtype < 3);
-  i = m_protocol.Serialize (i);
+  NS_ASSERT (m_subtype < 4);
+  
   if ((uint8_t)(WifiActionHeader::PEER_LINK_CLOSE) != m_subtype)
     {
       i.WriteHtolsbU16 (m_capability);
@@ -165,24 +168,15 @@
     }
   else
     {
-      i.WriteHtolsbU16 (m_reasonCode);
+      //reasonCode not used here
     }
 }
 uint32_t
 PeerLinkFrameStart::Deserialize (Buffer::Iterator start)
 {
   Buffer::Iterator i = start;
-  NS_ASSERT (m_subtype < 3);
-  {
-    uint8_t id = i.ReadU8 ();
-    uint8_t length = i.ReadU8 ();
-    m_protocol.DeserializeInformationField (i, length);
-    if ((m_protocol.ElementId () != (WifiInformationElementId) id) || (m_protocol.GetInformationFieldSize () != length))
-      {
-        NS_FATAL_ERROR ("Broken frame: Element ID does not match IE itself!");
-      }
-    i.Next (m_protocol.GetInformationFieldSize ());
-  }
+  NS_ASSERT (m_subtype < 4);
+  
   if ((uint8_t)(WifiActionHeader::PEER_LINK_CLOSE) != m_subtype)
     {
       m_capability = i.ReadLsbtohU16 ();
@@ -220,7 +214,7 @@
     }
   else
     {
-      m_reasonCode = i.ReadLsbtohU16 ();
+       //reasonCode not used here
     }
   return i.GetDistanceFrom (start);
 }
@@ -228,8 +222,8 @@
 operator== (const PeerLinkFrameStart & a, const PeerLinkFrameStart & b)
 {
   return ((a.m_subtype == b.m_subtype) && (a.m_capability == b.m_capability) && (a.m_aid == b.m_aid)
-          && (a.m_meshId.IsEqual (b.m_meshId)) && (a.m_config == b.m_config)
-          && (a.m_reasonCode == b.m_reasonCode));
+          && (a.m_meshId.IsEqual (b.m_meshId)) && (a.m_config == b.m_config));
+  
 }
 } // namespace dot11s
 } // namespace ns3
diff -Naur ns-3.22/src/mesh/model/dot11s/peer-management-protocol.cc ns-3.23/src/mesh/model/dot11s/peer-management-protocol.cc
--- ns-3.22/src/mesh/model/dot11s/peer-management-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/peer-management-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::dot11s::PeerManagementProtocol")
     .SetParent<Object> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<PeerManagementProtocol> ()
     // maximum number of peer links. Now we calculate the total
     // number of peer links on all interfaces
diff -Naur ns-3.22/src/mesh/model/dot11s/peer-management-protocol-mac.cc ns-3.23/src/mesh/model/dot11s/peer-management-protocol-mac.cc
--- ns-3.22/src/mesh/model/dot11s/peer-management-protocol-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/dot11s/peer-management-protocol-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -88,7 +88,7 @@
       packet->RemoveHeader (actionHdr);
       WifiActionHeader::ActionValue actionValue = actionHdr.GetAction ();
       // If can not handle - just return;
-      if (actionHdr.GetCategory () != WifiActionHeader::MESH_PEERING_MGT)
+      if (actionHdr.GetCategory () != WifiActionHeader::SELF_PROTECTED)
         {
           return m_protocol->IsActiveLink (m_ifIndex, header.GetAddr2 ());
         }
@@ -99,20 +99,19 @@
       PeerLinkFrameStart::PlinkFrameStartFields fields;
       {
         PeerLinkFrameStart peerFrame;
-        peerFrame.SetPlinkFrameSubtype ((uint8_t) actionValue.peerLink);
+        peerFrame.SetPlinkFrameSubtype ((uint8_t) actionValue.selfProtectedAction);
         packet->RemoveHeader (peerFrame);
         fields = peerFrame.GetFields ();
-        NS_ASSERT (fields.subtype == actionValue.peerLink);
+        NS_ASSERT (fields.subtype == actionValue.selfProtectedAction); 
       }
-      if ((actionValue.peerLink != WifiActionHeader::PEER_LINK_CLOSE) && !(m_parent->CheckSupportedRates (
-                                                                             fields.rates)))
+      if ((actionValue.selfProtectedAction != WifiActionHeader::PEER_LINK_CLOSE) && !(m_parent->CheckSupportedRates (fields.rates))) 
         {
           m_protocol->ConfigurationMismatch (m_ifIndex, peerAddress);
           // Broken peer link frame - drop it
           m_stats.brokenMgt++;
           return false;
         }
-      if ((actionValue.peerLink != WifiActionHeader::PEER_LINK_CONFIRM) && !fields.meshId.IsEqual (
+     if ((actionValue.selfProtectedAction != WifiActionHeader::PEER_LINK_CONFIRM) && !fields.meshId.IsEqual (
             *(m_protocol->GetMeshId ())))
         {
           m_protocol->ConfigurationMismatch (m_ifIndex, peerAddress);
@@ -125,22 +124,23 @@
       MeshInformationElementVector elements;
       packet->RemoveHeader (elements);
       peerElement = DynamicCast<IePeerManagement>(elements.FindFirst (IE11S_PEERING_MANAGEMENT));
+
       NS_ASSERT (peerElement != 0);
       //Check taht frame subtype corresponds peer link subtype
       if (peerElement->SubtypeIsOpen ())
         {
           m_stats.rxOpen++;
-          NS_ASSERT (actionValue.peerLink == WifiActionHeader::PEER_LINK_OPEN);
+         NS_ASSERT (actionValue.selfProtectedAction == WifiActionHeader::PEER_LINK_OPEN);
         }
       if (peerElement->SubtypeIsConfirm ())
         {
           m_stats.rxConfirm++;
-          NS_ASSERT (actionValue.peerLink == WifiActionHeader::PEER_LINK_CONFIRM);
+       NS_ASSERT (actionValue.selfProtectedAction == WifiActionHeader::PEER_LINK_CONFIRM); 
         }
       if (peerElement->SubtypeIsClose ())
         {
           m_stats.rxClose++;
-          NS_ASSERT (actionValue.peerLink == WifiActionHeader::PEER_LINK_CLOSE);
+           NS_ASSERT (actionValue.selfProtectedAction == WifiActionHeader::PEER_LINK_CLOSE); 
         }
       //Deliver Peer link management frame to protocol:
       m_protocol->ReceivePeerLinkFrame (m_ifIndex, peerAddress, peerMpAddress, fields.aid, *peerElement,
@@ -158,7 +158,7 @@
     {
       WifiActionHeader actionHdr;
       packet->PeekHeader (actionHdr);
-      if (actionHdr.GetCategory () == WifiActionHeader::MESH_PEERING_MGT)
+      if (actionHdr.GetCategory () == WifiActionHeader::SELF_PROTECTED) 
         {
           return true;
         }
@@ -215,27 +215,27 @@
     {
       m_stats.txOpen++;
       WifiActionHeader::ActionValue action;
-      action.peerLink = WifiActionHeader::PEER_LINK_OPEN;
+      action.selfProtectedAction = WifiActionHeader::PEER_LINK_OPEN;
       fields.subtype = WifiActionHeader::PEER_LINK_OPEN;
-      actionHdr.SetAction (WifiActionHeader::MESH_PEERING_MGT, action);
+      actionHdr.SetAction (WifiActionHeader::SELF_PROTECTED, action); 
     }
   if (peerElement.SubtypeIsConfirm ())
     {
       m_stats.txConfirm++;
       WifiActionHeader::ActionValue action;
-      action.peerLink = WifiActionHeader::PEER_LINK_CONFIRM;
+       action.selfProtectedAction = WifiActionHeader::PEER_LINK_CONFIRM; 
       fields.aid = aid;
       fields.subtype = WifiActionHeader::PEER_LINK_CONFIRM;
-      actionHdr.SetAction (WifiActionHeader::MESH_PEERING_MGT, action);
+      actionHdr.SetAction (WifiActionHeader::SELF_PROTECTED, action); 
     }
   if (peerElement.SubtypeIsClose ())
     {
       m_stats.txClose++;
       WifiActionHeader::ActionValue action;
-      action.peerLink = WifiActionHeader::PEER_LINK_CLOSE;
+      action.selfProtectedAction = WifiActionHeader::PEER_LINK_CLOSE; 
       fields.subtype = WifiActionHeader::PEER_LINK_CLOSE;
       fields.reasonCode = peerElement.GetReasonCode ();
-      actionHdr.SetAction (WifiActionHeader::MESH_PEERING_MGT, action);
+      actionHdr.SetAction (WifiActionHeader::SELF_PROTECTED, action); 
     }
   plinkFrame.SetPlinkFrameStart (fields);
   packet->AddHeader (plinkFrame);
diff -Naur ns-3.22/src/mesh/model/flame/flame-header.cc ns-3.23/src/mesh/model/flame/flame-header.cc
--- ns-3.22/src/mesh/model/flame/flame-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/flame/flame-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::flame::FlameHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<FlameHeader> ();
   return tid;
 }
diff -Naur ns-3.22/src/mesh/model/flame/flame-protocol.cc ns-3.23/src/mesh/model/flame/flame-protocol.cc
--- ns-3.22/src/mesh/model/flame/flame-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/flame/flame-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -46,7 +46,7 @@
 TypeId
 FlameTag::GetTypeId ()
 {
-  static TypeId tid = TypeId ("ns3::flame::FlameTag").SetParent<Tag> ().AddConstructor<FlameTag> ();
+  static TypeId tid = TypeId ("ns3::flame::FlameTag").SetParent<Tag> ().AddConstructor<FlameTag> ().SetGroupName ("Mesh");
   return tid;
 }
 
@@ -110,6 +110,7 @@
 {
   static TypeId tid = TypeId ("ns3::flame::FlameProtocol")
     .SetParent<MeshL2RoutingProtocol> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<FlameProtocol> ()
     .AddAttribute ( "BroadcastInterval",
                     "How often we must send broadcast packets",
diff -Naur ns-3.22/src/mesh/model/flame/flame-rtable.cc ns-3.23/src/mesh/model/flame/flame-rtable.cc
--- ns-3.22/src/mesh/model/flame/flame-rtable.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/flame/flame-rtable.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
   static TypeId tid =
     TypeId ("ns3::flame::FlameRtable")
     .SetParent<Object> ().AddConstructor<FlameRtable> ()
+    .SetGroupName ("Mesh")
     .AddAttribute ( "Lifetime",
                     "The lifetime of the routing enrty",
                     TimeValue (Seconds (120)), MakeTimeAccessor (
diff -Naur ns-3.22/src/mesh/model/mesh-information-element.h ns-3.23/src/mesh/model/mesh-information-element.h
--- ns-3.22/src/mesh/model/mesh-information-element.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/mesh-information-element.h	2015-05-13 11:05:27.000000000 -0700
@@ -25,31 +25,31 @@
 
 namespace ns3 {
 
-#define IE11S_LINK_METRIC_REPORT               ((WifiInformationElementId)20)
-#define IE11S_CONGESTION_NOTIFICATION          ((WifiInformationElementId)21)
+#define IE11S_LINK_METRIC_REPORT               ((WifiInformationElementId)115)
+#define IE11S_CONGESTION_NOTIFICATION          ((WifiInformationElementId)116)
 #define IE11S_SUPP_MBSS_REG_CLASSES_CHANNELS   ((WifiInformationElementId)23)
 #define IE11S_MESH_CHANNEL_SWITCH_ANNOUNCEMENT ((WifiInformationElementId)24)
 #define IE11S_MESH_TIM                         ((WifiInformationElementId)25)
-#define IE11S_AWAKE_WINDOW                     ((WifiInformationElementId)26)
-#define IE11S_BEACON_TIMING                    ((WifiInformationElementId)27)
-#define IE11S_MCCAOP_SETUP_REQUEST             ((WifiInformationElementId)28)
-#define IE11S_MCCAOP_SETUP_REPLY               ((WifiInformationElementId)29)
-#define IE11S_MCCAOP_ADVERTISEMENT             ((WifiInformationElementId)30)
+#define IE11S_AWAKE_WINDOW                     ((WifiInformationElementId)119)
+#define IE11S_BEACON_TIMING                    ((WifiInformationElementId)120)
+#define IE11S_MCCAOP_SETUP_REQUEST             ((WifiInformationElementId)121)
+#define IE11S_MCCAOP_SETUP_REPLY               ((WifiInformationElementId)122)
+#define IE11S_MCCAOP_ADVERTISEMENT             ((WifiInformationElementId)123)
 #define IE11S_MCCAOP_RESERVATION_TEARDOWN      ((WifiInformationElementId)31)
 #define IE11S_PORTAL_ANNOUNCEMENT              ((WifiInformationElementId)32)
-#define IE11S_PROXY_UPDATE                     ((WifiInformationElementId)37)
-#define IE11S_PROXY_UPDATE_CONFIRMATION        ((WifiInformationElementId)38)
+#define IE11S_PROXY_UPDATE                     ((WifiInformationElementId)137)
+#define IE11S_PROXY_UPDATE_CONFIRMATION        ((WifiInformationElementId)138)
 #define IE11S_ABBREVIATED_HANDSHAKE            ((WifiInformationElementId)39)
 /* begin of open80211s-compatible IDs */
-#define IE11S_MESH_CONFIGURATION               ((WifiInformationElementId)51)
-#define IE11S_MESH_ID                          ((WifiInformationElementId)52)
-#define IE11S_PEERING_MANAGEMENT               ((WifiInformationElementId)55)
+#define IE11S_MESH_CONFIGURATION               ((WifiInformationElementId)113)
+#define IE11S_MESH_ID                          ((WifiInformationElementId)114)
+#define IE11S_PEERING_MANAGEMENT               ((WifiInformationElementId)117)
 /* end of open80211s-compatible IDs */
-#define IE11S_RANN                             ((WifiInformationElementId)67)
+#define IE11S_RANN                             ((WifiInformationElementId)126)
 /* begin of open80211s-compatible IDs */
-#define IE11S_PREQ                             ((WifiInformationElementId)68)
-#define IE11S_PREP                             ((WifiInformationElementId)69)
-#define IE11S_PERR                             ((WifiInformationElementId)70)
+#define IE11S_PREQ                             ((WifiInformationElementId)130)
+#define IE11S_PREP                             ((WifiInformationElementId)131)
+#define IE11S_PERR                             ((WifiInformationElementId)132)
 /* end of open80211s-compatible IDs */
 #define IE11S_MESH_PEERING_PROTOCOL_VERSION    ((WifiInformationElementId)74)
 
diff -Naur ns-3.22/src/mesh/model/mesh-l2-routing-protocol.cc ns-3.23/src/mesh/model/mesh-l2-routing-protocol.cc
--- ns-3.22/src/mesh/model/mesh-l2-routing-protocol.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/mesh-l2-routing-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -33,7 +33,9 @@
 MeshL2RoutingProtocol::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::MeshL2RoutingProtocol")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Mesh")
+  ;
   return tid;
 }
 
diff -Naur ns-3.22/src/mesh/model/mesh-point-device.cc ns-3.23/src/mesh/model/mesh-point-device.cc
--- ns-3.22/src/mesh/model/mesh-point-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/mesh-point-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::MeshPointDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Dsr")
     .AddConstructor<MeshPointDevice> ()
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (0xffff),
diff -Naur ns-3.22/src/mesh/model/mesh-wifi-interface-mac.cc ns-3.23/src/mesh/model/mesh-wifi-interface-mac.cc
--- ns-3.22/src/mesh/model/mesh-wifi-interface-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/model/mesh-wifi-interface-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -47,6 +47,7 @@
 {
   static TypeId tid = TypeId ("ns3::MeshWifiInterfaceMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Mesh")
     .AddConstructor<MeshWifiInterfaceMac> ()
     .AddAttribute ( "BeaconInterval",
                     "Beacon Interval",
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-0-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-0-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-0-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-0-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,62 +1,55 @@
-�ò���iB�RRЀ<
J

�$0H`l4mesh3
������97
a�Ԁ
H�Ԁ
�PPЀ<

J

�$0H`l3
������97

�AA�������� ���

�$0H`l��
4mesh%�RRЀ<J

�$0H`l4mesh3
������97
��Ԁ��PPЀ<0
J


�$0H`l3
������97

��Ԁ��RRЀ<@J

�$0H`l4mesh3
������97��Ԁ��PPЀ<
J

�$0H`l3
������97

��ԀJO
AA�������� JO
�

�$0H`l��
4mesh+bFF��������P�a�

�$0H`l
-7�

O
�
4meshj�AA��������0j��

�$0H`lb�
4mesh��
-??Ѐ<
` E 
�a�
-EEЀ������p D%

��
��������
-??Ѐ<@ E 
�,�
-Ԁ��
-??Ѐ<
� E

����
-??Ј<
� E

��:�
-EEЀ������P D%
�,

������
�FF�����������

�$0H`l
-��

��
4mesh
JO
AA��������`���

�$0H`l�
4mesh
+bFF�����������

�$0H`l
-z�

��
4mesh
j�AA��������p�2�

�$0H`l��
4mesh��??Ѐ<
� E 
���FF���������E�

�$0H`l
-�

3�
4mesh�??Ј<
� E 
��EEЀ������� D%

��
������A�??Ѐ<� E 
���Ԁ��??Ѐ<
� E

��O�EEЀ������� D%
�,

������JO
AA������������

�$0H`lF�
4mesh[�LL��������������
��


+�ò���i&�>>Ѐ<


�$0H`lrmeshq


9u

)�Ԁ
�Ԁ
��<<Ѐ<

�$0H`lq


9u
�AA�������� ���

�$0H`lx��
rmesh%�>>Ѐ<

�$0H`lrmeshq


9u

��ԀX�<<Ѐ<0

�$0H`lq


9u
h�Ԁ>�>>Ѐ<@

�$0H`lrmeshq


9u
N�Ԁ��<<Ѐ<
�$0H`lq


9u
@�ԀJO
AA�������� JO
�

�$0H`lx��
rmesh+bFF��������P�a�

�$0H`lx
+7�

O
�
rmeshj�AA��������0j��

�$0H`lxb�
rmesh
�FF��������`��

�$0H`lx
+��

��
rmesh
JO
AA��������@���

�$0H`lx�
rmesh
+bFF��������p��

�$0H`lx
+z�

��
rmesh
j�AA��������P�2�

�$0H`lx��
rmesh��??Ѐ<
�

� 
�z�FF���������E�

�$0H`lx
+�

3�
rmesh�EEЀ�������

�%

��
������*�??Ѐ<`

� 
���Ԁb�??Ѐ<
�

�

��V�??Ј<
�

�

����EEЀ������p

�%
�,

������JO
AA������������

�$0H`lxE�
rmesh[�LL��������������
��


 

������
-


��LL�<� ��

+


��LL�<� ��

 



-

B�Ԁm�LL��������������
��


+

B�Ԁm�LL��������������
��


 

������
-


��LL�<

��

+


��LL�<
���

 



-

��Ԁ
�����<
��E�@
+

��Ԁ
�����<���E�@
 


-


�
	l��Ԁ�LL�������������� 
��


+


�
	l��Ԁ�LL�������������� 
��


 


������
-

G�LL������������� 

��


+

G�LL��������������
��


 


������
-

Y�Ԁ
�LL�<0
��

+

Y�Ԁ
�LL�<
��

 


-


�Ԁk����<� ��E�@
+


�Ԁk����<� ��E�@
 



-

	�
l��Ԁ�����<
@
��E�@
+

	�
l��Ԁ�����<

��E�@
 



-

	�
l+bFF��������P
3�&�

�$0H`l
-�&�

��
4meshj�AA����������t'�

�$0H`l�&�
4meshk??Ѐ<
`
 E 
�lEEЀ������p
 D%

��
������*l??Ѐ<
 E 
��lԀjm??Ѐ<
�
 E

���mEEЀ������
 D%
�Y

������Ԁ
F���<�
��E�
@
+

	�
l+bFF�������� 
3�&�

�$0H`lx
+�&�

��
rmeshj�AA����������t'�

�$0H`lx�&�
rmeshԀ
F���<0
��E�
@
 


-


�
	lVԀ����< 
 ��E�
@
+


�
	lVԀ����<� ��E�
@
 



-

	�
l�Ԁ[���<
�
��E�
@
+

	�
l�Ԁ[���<
@
��E�
@
 



-

	�
l�FF���������
S�.�

�$0H`l
-].�

u'�
4meshJO
AA��������0

-/�

�$0H`l�.�
4mesh7�Ԁ
f����<�
��E�@
+

	�
l�FF��������P
S�.�

�$0H`lx
+].�

u'�
rmeshJO
AA���������
+/�

�$0H`lx�.�
rmesh7�Ԁ
f����<`
��E�@
 


-


�
	lv�Ԁͦ���<@
 ��E�@
+


�
	lv�Ԁͦ���<
 ��E�@
 



-

	�
l
�Ԁ{����<
�
��E�@
+

	�
l
�Ԁ{����<
p
��E�@
 



-

	�
l+bFF���������
s(6�

�$0H`l
-�5�

/�
4meshj�AA��������P
*�6�

�$0H`l(6�
4meshԀ
F���<�
��E�@
+

	�
l+bFF���������
s(6�

�$0H`lx
+�5�

/�
rmeshj�AA��������
*�6�

�$0H`lx(6�
rmeshԀ
F���<�
��E�@
 


-


�
	lVԀ����<`
 ��E�@
+


�
	lVԀ����< 
 ��E�@
 



-

	�
l�Ԁ����<
��E�@
+

	�
l�Ԁ����<
�
��E�@
 



-

	�
l�FF����������=�

�$0H`l
-�=�

�6�
4meshJO
AA��������p
JX>�

�$0H`l�=�
4mesh|
??Ѐ<
  E 
�
}
??Ј<
  E 
�
~
EEЀ������0 D%

�m
������/~
??Ѐ<�
 E 
��~
ԀJ
??Ѐ<
@ E

���
EEЀ�������
 D%
��
�������Ԁ
����<P��E�@
+

	�
l�FF���������
��=�

�$0H`lx
+�=�

�6�
rmeshJO
AA��������0
JX>�

�$0H`lx�=�
rmesh,|
??Ѐ<
�


� 
�}
??Ј<
�


� 
�~
EEЀ�������


�%

��
������0~
??Ѐ<@


� 
��~
Ԁ�
??Ѐ<
�


�

��>�
EEЀ������P


�%
�,

������7�Ԁ
f����<�
��E�@
 


-


�
	l&�Ԁ}����<�
 ��E�@
+


�
	lv�Ԁͦ���<`
 ��E�@
 



-

	�
lm�Ԁ����<
`��E�@
+

	�
l
�Ԁ�����<
��E�@
 



-

	�
l+bFF��������p�jE�

�$0H`l
-@E�

X>�
4meshj�AA���������
j�E�

�$0H`lkE�
4mesh�&??Ѐ<
� E 
��'EEЀ������� D%

��
�������'??Ѐ<�
 E 
�7(Ԁ�(??Ѐ<
� E

��v)EEЀ�������
 D%
�

������
\ No newline at end of file
+

	�
l+bFF���������jE�

�$0H`lx
+@E�

X>�
rmeshj�AA��������p
j�E�

�$0H`lxkE�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-1-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-1-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-1-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-1-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,107 +1,95 @@
-�ò���i�EEЀ������

 D% 

�
������%RRЀ<

J

�$0H`l4mesh3
������97
>&Ԁ7'Ԁ�'PPЀ<

 
J

�$0H`l3
������97


��AA��������

0(��

�$0H`l$�
4mesh��RRЀ<
J

�$0H`l4mesh3
������97
�Ԁ%�PPЀ<

@
J


�$0H`l3
������97

5�Ԁ
�RRЀ<

PJ

�$0H`l4mesh3
������97�Ԁ
{�PPЀ<

J

�$0H`l3
������97

<�Ԁ��AA�������� ���

�$0H`l��
4mesh��RRЀ<J

�$0H`l4mesh3
������97
��Ԁ�PPЀ<0
J


�$0H`l3
������97

��Ԁ	�RRЀ<@J

�$0H`l4mesh3
������97��Ԁt�PPЀ<
J

�$0H`l3
������97

��Ԁ�O
AA�������� JO
�

�$0H`l��
4mesh�7FF��������

`H7�

�$0H`l
-��

��
4mesh�aFF��������P�a�

�$0H`l
-7�

O
�
4mesh��AA��������0j��

�$0H`lb�
4mesh��
-EEЀ������

p D% 
�
�������
-??Ѐ<
` E 
�ů
-Ԁ��
-Ԁ��
-EEЀ������p D%

��
�������
-??Ѐ<@ E 
���
-ԀN�
-??Ѐ<
� E

����
-ԀB�
-??Ј<
� E

���
-Ԁ��
-EEЀ������P D%
�,

������
��FF��������

�h��

�$0H`l
-f�

b�
4mesh
��FF�����������

�$0H`l
-��

��
4mesh
�O
AA��������`���

�$0H`l�
4mesh
�7FF��������

��y�

�$0H`l
-�

�
4mesh
�aFF�����������

�$0H`l
-z�

��
4mesh
��AA��������p�2�

�$0H`l��
4mesh��FF��������

���

�$0H`l
-��

��
4mesh�EEЀ������

� D% 
�
������@�??Ѐ<
� E 
��FF���������E�

�$0H`l
-�

3�
4mesh��??Ј<
� E 
�\�Ԁ��EEЀ������� D%

��
��������??Ѐ<� E 
���Ԁ5�ԀW�??Ѐ<
� E

���Ԁ��EEЀ������� D%
�,

��������Ԁ�O
AA������������

�$0H`lF�
4mesh��LL�������
�������
��


+�ò���i�EEЀ������



�% 

�
������%>>Ѐ<



�$0H`lrmeshq


9u

�(>>Ј<



�$0H`lrmeshq


9u

t)>>Ј<



�$0H`lrmeshq


9u

w*Ԁ#,Ԁ�,<<Ѐ<

 
�$0H`lq


9u
��AA��������

0(��

�$0H`lx$�
rmesh��>>Ѐ<


�$0H`lrmeshq


9u

c�Ԁ�<<Ѐ<

@

�$0H`lq


9u
��Ԁ
ɘ>>Ѐ<

P

�$0H`lrmeshq


9u
٘Ԁ
'�<<Ѐ<

�$0H`lq


9u
̙Ԁ��AA�������� ���

�$0H`lx��
rmesh��>>Ѐ<

�$0H`lrmeshq


9u

��Ԁ��<<Ѐ<0

�$0H`lq


9u
��Ԁ��>>Ѐ<@

�$0H`lrmeshq


9u
z�Ԁ�<<Ѐ<
�$0H`lq


9u
�Ԁ�O
AA�������� JO
�

�$0H`lx��
rmesh�7FF��������

`H7�

�$0H`lx
+��

��
rmesh�aFF��������P�a�

�$0H`lx
+7�

O
�
rmesh��AA��������0j��

�$0H`lxb�
rmesh
��FF��������

ph��

�$0H`lx
+f�

b�
rmesh
��FF��������`��

�$0H`lx
+��

��
rmesh
�O
AA��������@���

�$0H`lx�
rmesh
�7FF��������

��y�

�$0H`lx
+�

�
rmesh
�aFF��������p��

�$0H`lx
+z�

��
rmesh
��AA��������P�2�

�$0H`lx��
rmesh��FF��������

���

�$0H`lx
+��

��
rmesh�EEЀ������

�

�% 
�
������@�??Ѐ<
�

� 
���Ԁ�FF���������E�

�$0H`lx
+�

3�
rmeshE�Ԁ��EEЀ�������

�%

��
��������??Ѐ<`

� 
���Ԁ��??Ѐ<
�

�

����Ԁ��??Ј<
�

�

����ԀV�EEЀ������p

�%
�,

�������O
AA������������

�$0H`lxE�
rmesh��LL�������
�������
��


 

������
-


��LL��������������
��


+


��LL��������������
��


 

������
-


�LL�<� ��

+


�LL�<� ��

 



-

�Ԁ��LL��������������
��


+

�Ԁ��LL��������������
��


 

������
-


X�LL�<

��

+


X�LL�<
���

 



-

�Ԁ��LL�<
���

+

�Ԁ��LL�<
���

 



-

/�Ԁp����<
���E�@
+

/�Ԁp����<
���E�@
 


-


�
	l��Ԁ
�����<
��E�@
+


�
	l��Ԁ
�����<���E�@
 


-


�
	l�Ԁ��LL�������������� 
��


+


�
	l�Ԁ��LL�������������� 
��


 


������
-

��LL������������� 

��


+

��LL��������������
��


 


������
-

��LL�������
�������
��


+

��LL�������
�������
��


 


������
-

r�Ԁ�LL�<

��

+

r�Ԁ�LL�<
���

 


-


-�Ԁ
��LL�<0
��

+


-�Ԁ
��LL�<
��

 


-


A�Ԁp����<� ��E�@
+


A�Ԁp����<� ��E�@
 



-

	�
l��Ԁ�����<
@
��E�@
+

	�
l��Ԁ�����<

��E�@
 



-

	�
l)�Ԁ�����<

��E�@
+

	�
l)�Ԁ�����<

��E�@
 



-

	�
l�7FF��������

 
Ȼ&�

�$0H`l
-J&�

F�
4mesh�aFF��������P
3�&�

�$0H`l
-�&�

��
4mesh��AA����������t'�

�$0H`l�&�
4meshzjEEЀ������

0
 D% 
�
�������j??Ѐ<
`
 E 
�EkԀ�kEEЀ������p
 D%

��
�������l??Ѐ<
 E 
��lԀ�l??Ѐ<
�
 E

���mԀjnEEЀ������
 D%
�Y

�������oԀ�Ԁ����<
@
��E�
@
+

	�
l�7FF��������


Ȼ&�

�$0H`lx
+J&�

E�
rmesh�aFF�������� 
3�&�

�$0H`lx
+�&�

��
rmesh��AA����������t'�

�$0H`lx�&�
rmesh�Ԁ����<
 
��E�
@
 


-


�
	l�Ԁ
A���<�
��E�
@
+


�
	l�Ԁ
A���<0
��E�
@
 


-


�
	l�Ԁ����< 
 ��E�
@
+


�
	l�Ԁ����<� ��E�
@
 



-

	�
l�ԀW���<
�
��E�
@
+

	�
l�ԀW���<
@
��E�
@
 



-

	�
l�Ԁ�	���<
P
��E�
@
+

	�
l�Ԁ�	���<
0
��E�
@
 



-

	�
l��FF��������

`
�\.�

�$0H`l
-�-�

�&�
4mesh��FF���������
S�.�

�$0H`l
-].�

u'�
4mesh�O
AA��������0

-/�

�$0H`l�.�
4meshˣԀ�����<
p
��E�@
+

	�
l��FF��������

@
�\.�

�$0H`lx
+�-�

�&�
rmesh��FF��������P
S�.�

�$0H`lx
+].�

u'�
rmesh�O
AA���������
+/�

�$0H`lx�.�
rmeshˣԀ�����<
P
��E�@
 


 


�
	l
-�Ԁ
a����<�
��E�@
+�Ԁ
a����<`
��E�@
 


-


�
	l��Ԁѧ���<@
 ��E�@
+


�
	l��Ԁѧ���<
 ��E�@
 



-

	�
l�Ԁw����<
�
��E�@
+

	�
l�Ԁw����<
p
��E�@
 



-

	�
l��Ԁ&����<
�
��E�@
+

	�
l��Ԁ&����<
`
��E�@
 



-

	�
l�7FF��������

�
�5�

�$0H`l
-�5�

�.�
4mesh�aFF���������
s(6�

�$0H`l
-�5�

/�
4mesh��AA��������P
*�6�

�$0H`l(6�
4mesh�Ԁ����<
�
��E�@
+

	�
l�7FF��������

p
�5�

�$0H`lx
+�5�

�.�
rmesh�aFF���������
s(6�

�$0H`lx
+�5�

/�
rmesh��AA��������
*�6�

�$0H`lx(6�
rmesh�Ԁ����<
�
��E�@
 


-


�
	l�Ԁ
A���<�
��E�@
+


�
	l�Ԁ
A���<�
��E�@
 


-


�
	l�Ԁ����<`
 ��E�@
+


�
	l�Ԁ����< 
 ��E�@
 



-

	�
l�Ԁ����<
��E�@
+

	�
l�Ԁ����<
�
��E�@
 



 

	�
l�Ԁ
-���<
�
��E�@
+���<
�
��E�@
 



-

	�
l��FF��������

�
(�=�

�$0H`l
--=�

(6�
4mesh��FF����������=�

�$0H`l
-�=�

�6�
4mesh�O
AA��������p
JX>�

�$0H`l�=�
4mesh�{
EEЀ������

�
 D% 
�
�������{
??Ѐ<
  E 
��|
??Ј<
  E 
�J}
Ԁ�}
EEЀ������0 D%

�m
������~
??Ѐ<�
 E 
��~
Ԁ�~
??Ѐ<
@ E

���
ԀJ�
EEЀ�������
 D%
��
������&�
Ԁ{�Ԁ�����<
�
��E�@
+

	�
l��FF��������

�
(�=�

�$0H`lx
+-=�

(6�
rmesh��FF���������
��=�

�$0H`lx
+�=�

�6�
rmesh�O
AA��������0
JX>�

�$0H`lx�=�
rmesh�{
EEЀ������

�


�% 
�
�������{
??Ѐ<
�


� 
��|
??Ј<
�


� 
�K}
Ԁ�}
EEЀ�������


�%

��
�������~
??Ѐ<@


� 
��~
Ԁ$
ԀF
??Ѐ<
�


�

���
Ԁ��
EEЀ������P


�%
�,

������ł
ԀˣԀ�����<
�
��E�@
 


-


�
	l��Ԁ
����<P��E�@
+


�
	l
+�Ԁ
a����<�
��E�@
 


-


�
	lR�Ԁ1����<�
 ��E�@
+


�
	l��Ԁѧ���<`
 ��E�@
 



-

	�
lA�Ԁ����<
`��E�@
+

	�
l�Ԁ�����<
��E�@
 



-

	�
lE�Ԁt����<
�
��E�@
+

	�
l�Ԁ����<
�
��E�@
 



-

	�
l�7FF��������

H@E�

�$0H`l
-�D�

�=�
4mesh�aFF��������p�jE�

�$0H`l
-@E�

X>�
4mesh��AA���������
j�E�

�$0H`lkE�
4mesh�%EEЀ������

 D% 
�
������&??Ѐ<
� E 
��&Ԁ'EEЀ������� D%

��
�������'??Ѐ<�
 E 
�
-(Ԁ~(??Ѐ<
� E

��')Ԁ�)EEЀ�������
 D%
�

������c+Ԁ
\ No newline at end of file
+

	�
l�7FF��������

�
H@E�

�$0H`lx
+�D�

�=�
rmesh�aFF���������jE�

�$0H`lx
+@E�

X>�
rmesh��AA��������p
j�E�

�$0H`lxkE�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-2-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-2-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-2-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-2-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,126 +1,114 @@
-�ò���i*EEЀ������

 D% 

�
������u$<<��������
$�

�$0H`l4mesh�$RRЀ<

J

�$0H`l4mesh3
������97
\%Ԁ
&PPЀ<

J

�$0H`l3
������97


&Ԁ�&RRЀ<
 J

�$0H`l4mesh3
������97

-'Ԁa'PPЀ<

 
J

�$0H`l3
������97


"(Ԁ
$)Ԁ�)PPЀ<0
J


�$0H`l3
������97

�*RRЀ<@J

�$0H`l4mesh3
������97�+Ԁ(�AA��������

0(��

�$0H`l$�
4meshB�RRЀ<
J

�$0H`l4mesh3
������97
R�Ԁ��PPЀ<

@
J


�$0H`l3
������97

a�Ԁ
��RRЀ<

PJ

�$0H`l4mesh3
������97H�Ԁ
�PPЀ<

J

�$0H`l3
������97

�Ԁ�AA�������� ���

�$0H`l��
4mesh��Ԁ��PPЀ<0
J


�$0H`l3
������97

��RRЀ<@J

�$0H`l4mesh3
������97��Ԁ��FF��������P-��

�$0H`l
-��

��
4meshH7FF��������

`H7�

�$0H`l
-��

��
4mesh+bFF��������P�a�

�$0H`l
-7�

O
�
4mesh��
-EEЀ������

p D% 
�
��������
-??Ѐ<
` E 
���
-Ԁa�
-??Ј<
` E 
�q�
-Ԁa�
-EEЀ������p D%

��
������,�
-Ԁ��
-??Ѐ<
� E

��ʲ
-Ԁ��
-??Ј<
� E

����
-Ԁ
�$FF���������Mf�

�$0H`l
-7�

J�
4mesh
(�FF��������

�h��

�$0H`l
-f�

b�
4mesh
�FF�����������

�$0H`l
-��

��
4mesh
��FF���������m�

�$0H`l
-��

��
4mesh
H7FF��������

��y�

�$0H`l
-�

�
4mesh
+bFF�����������

�$0H`l
-z�

��
4mesh�$FF������������

�$0H`l
-z�

��
4mesh(�FF��������

���

�$0H`l
-��

��
4mesh��EEЀ������

� D% 
�
��������FF���������E�

�$0H`l
-�

3�
4mesh�??Ј<
� E 
�/�Ԁ�EEЀ������� D%

��
��������??Ј<
� E 
�	�Ԁ��??Ѐ<
� E

����ԀA�EEЀ������� D%

��
�������Ԁ��??Ѐ<
� E

����Ԁs�LL��������������
��


+�ò���i*EEЀ������



�% 

�
������u$<<��������
$�

�$0H`lxrmesh�$>>Ѐ<



�$0H`lrmeshq


9u

F&Ԁ�&<<Ѐ<
�$0H`lq


9u

�'>>Ѐ< 

�$0H`lrmeshq


9u

(>>Ј<



�$0H`lrmeshq


9u

)>>Ј<



�$0H`lrmeshq


9u

�)Ԁ
;*<<Ѐ<
0

�$0H`lq


9u
K*ԀG+Ԁ�+>>Ѐ<
@

�$0H`lrmeshq


9u
�+ԀE,<<Ѐ<

 
�$0H`lq


9u
�,Ԁ
(�AA��������

0(��

�$0H`lx$�
rmesh&�>>Ѐ<


�$0H`lrmeshq


9u

6�Ԁ��<<Ѐ<

@

�$0H`lq


9u
)�Ԁ
]�>>Ѐ<

P

�$0H`lrmeshq


9u
�Ԁ
��<<Ѐ<

�$0H`lq


9u
��Ԁ�AA�������� ���

�$0H`lx��
rmesh��ԀX�<<Ѐ<0

�$0H`lq


9u
>�>>Ѐ<@

�$0H`lrmeshq


9u
@�Ԁ��FF��������P-��

�$0H`lx
+��

��
rmeshH7FF��������

`H7�

�$0H`lx
+��

��
rmesh+bFF��������P�a�

�$0H`lx
+7�

O
�
rmesh
�$FF��������`Mf�

�$0H`lx
+J�

7�
rmesh
(�FF��������

ph��

�$0H`lx
+f�

b�
rmesh
�FF��������`��

�$0H`lx
+��

��
rmesh
��FF��������pm�

�$0H`lx
+��

��
rmesh
H7FF��������

��y�

�$0H`lx
+�

�
rmesh
+bFF��������p��

�$0H`lx
+z�

��
rmesh�$FF������������

�$0H`lx
+��

z�
rmesh(�FF��������

���

�$0H`lx
+��

��
rmesh��EEЀ������

�

�% 
�
��������??Ѐ<
�

� 
���Ԁz�FF���������E�

�$0H`lx
+�

3�
rmesh	�??Ј<
�

� 
��Ԁ��Ԁb�??Ѐ<
�

�

��r�ԀV�??Ј<
�

�

��f�Ԁs�LL��������������
��


 

������
-


�FF��������
�I&�

�$0H`l
-�

-&�
4mesh/�LL�������
�������
��


+


�FF����������I&�

�$0H`lx
+-&�

�
rmesh/�LL�������
�������
��


 

������
-


[�LL��������������
��


+


[�LL��������������
��


 

������
-


B�Ԁ��LL�<

��

+


B�Ԁ��LL�<
���

 



-

��Ԁu�LL�<
���

+

��Ԁu�LL�<
���

 



-

2�Ԁ
��LL�<
��

+

2�Ԁ
��LL�<���

 



-

��Ԁ�����<
 
��E�@
+

��Ԁ�����<
���E�@
 


-


�
	l�Ԁk����<
���E�@
+


�
	l�Ԁk����<
���E�@
 


-


�
	l��Ԁ
�����<
��E�@
+


�
	l��Ԁ
�����<���E�@
 


-


�
	lG�LL������������� 

��


+


�
	lG�LL��������������
��


 


������
-

r�LL�������
�������
��


+

r�LL�������
�������
��


 


������
-

��LL�������������0

��


+

��LL�������������

��


 


������
-

��Ԁ6�LL�<
@
��

+

��Ԁ6�LL�<

��

 


-


F�Ԁ��LL�<

��

+


F�Ԁ��LL�<
���

 


-


Y�Ԁ
�LL�<0
��

+


Y�Ԁ
�LL�<
��

 


-


��Ԁ�����<
@
��E�@
+


��Ԁ�����<

��E�@
 



-

	�
l��Ԁ�����<

��E�@
+

	�
l��Ԁ�����<

��E�@
 



-

	�
l��Ԁ
'����<P
��E�@
+

	�
l��Ԁ
'����< 
��E�@
 



-

	�
lH7FF��������

 
Ȼ&�

�$0H`l
-J&�

F�
4mesh+bFF��������P
3�&�

�$0H`l
-�&�

��
4meshjEEЀ������

0
 D% 
�
������k??Ѐ<
`
 E 
�kԀlEEЀ������p
 D%

��
�������l??Ј<
`
 E 
��lԀjm??Ѐ<
�
 E

��zmԀjnEEЀ������p
 D%

��
������5oԀ�o??Ѐ<
�
 E

���oԀ@
Ԁo���<
�
��E�
@
+

	�
lH7FF��������


Ȼ&�

�$0H`lx
+J&�

E�
rmesh+bFF�������� 
3�&�

�$0H`lx
+�&�

��
rmesh@
Ԁo���<
0
��E�
@
 


-


�
	lԀ����<
@
��E�
@
+


�
	lԀ����<
 
��E�
@
 


-


�
	lԀ
F���<�
��E�
@
+


�
	lԀ
F���<0
��E�
@
 


-


�
	l�Ԁ[���<
�
��E�
@
+


�
	l�Ԁ[���<
@
��E�
@
 



-

	�
lkԀ����<
P
��E�
@
+

	�
lkԀ����<
0
��E�
@
 



 

	�
l
-Ԁ
2���<�
��E�
@
+Ԁ
2���<@
��E�
@
 



-

	�
l�$FF���������
��-�

�$0H`l
-�&�

�-�
4mesh(�FF��������

`
�\.�

�$0H`l
-�-�

�&�
4mesh�FF���������
S�.�

�$0H`l
-].�

u'�
4mesh`�Ԁ�����<
�
��E�@
+

	�
l�$FF��������P
��-�

�$0H`lx
+�-�

�&�
rmesh(�FF��������

@
�\.�

�$0H`lx
+�-�

�&�
rmesh�FF��������P
S�.�

�$0H`lx
+].�

u'�
rmesh`�Ԁ�����<
`
��E�@
 


-


�
	l��Ԁ�����<
p
��E�@
+


�
	l��Ԁ�����<
P
��E�@
 


-


�
	l7�Ԁ
f����<�
��E�@
+


�
	l7�Ԁ
f����<`
��E�@
 


-


�
	l
�Ԁ{����<
�
��E�@
+


�
	l
�Ԁ{����<
p
��E�@
 



-

	�
l��Ԁ!����<
�
��E�@
+

	�
l��Ԁ!����<
`
��E�@
 



-

	�
lb�Ԁ
�����<�
��E�@
+

	�
lb�Ԁ
�����<p
��E�@
 



-

	�
l��FF���������
�5�

�$0H`l
-].�

o5�
4meshH7FF��������

�
�5�

�$0H`l
-�5�

�.�
4mesh+bFF���������
s(6�

�$0H`l
-�5�

/�
4mesh@
Ԁo���<
�
��E�@
+

	�
l��FF���������
�5�

�$0H`lx
+o5�

].�
rmeshH7FF��������

p
�5�

�$0H`lx
+�5�

�.�
rmesh+bFF���������
s(6�

�$0H`lx
+�5�

/�
rmesh@
Ԁo���<
�
��E�@
 


-


�
	lԀ����<
�
��E�@
+


�
	lԀ����<
�
��E�@
 


-


�
	lԀ
F���<�
��E�@
+


�
	lԀ
F���<�
��E�@
 


-


�
	l�Ԁ����<
��E�@
+


�
	l�Ԁ����<
�
��E�@
 



-

	�
l�Ԁ
	���<
�
��E�@
+

	�
l�Ԁ
	���<
�
��E�@
 



 

	�
lB
-Ԁ
q���<��E�@
+Ԁ
q���<�
��E�@
 



-

	�
l�$FF��������
-=�

�$0H`l
-�5�

=�
4mesh(�FF��������

�
(�=�

�$0H`l
--=�

(6�
4mesh�FF����������=�

�$0H`l
-�=�

�6�
4mesh*{
EEЀ������

�
 D% 
�
������
}
??Ј<
  E 
�}
Ԁ
~
EEЀ������0 D%

�m
�������~
ԀJ
??Ѐ<
@ E

��Z
Ԁ&�
??Ј<
  E 
�6�
Ԁ��
EEЀ������0 D%

��
������\�
Ԁ�
??Ѐ<
@ E

����
Ԁ�Ԁ?����<
P��E�@
+

	�
l�$FF���������

-=�

�$0H`lx
+=�

�5�
rmesh(�FF��������

�
(�=�

�$0H`lx
+-=�

(6�
rmesh�FF���������
��=�

�$0H`lx
+�=�

�6�
rmesh*{
EEЀ������

�


�% 
�
������}
??Ј<
�


� 
�}
Ԁ~
EEЀ�������


�%

��
�������~
??Ј<
�


� 
��~
Ԁ�
??Ѐ<
�


�

���
Ԁ0�
EEЀ�������


�%

��
��������
Ԁ��
??Ѐ<
�


�

����
Ԁ`�Ԁ�����<
�
��E�@
 


-


�
	lO�Ԁ�����<
�
��E�@
+


�
	l��Ԁ�����<
�
��E�@
 


-


�
	l�Ԁ
����<P��E�@
+


�
	l7�Ԁ
f����<�
��E�@
 


-


�
	lm�Ԁ����<
`��E�@
+


�
	l
�Ԁ�����<
��E�@
 



-

	�
l�Ԁo����<
�
��E�@
+

	�
l��Ԁ����<
�
��E�@
 



-

	�
l��Ԁ
߫���<`��E�@
+

	�
lY�Ԁ
�����<��E�@
 



-

	�
l��FF��������p-�D�

�$0H`l
-�=�

�D�
4meshH7FF��������

H@E�

�$0H`l
-�D�

�=�
4mesh+bFF��������p�jE�

�$0H`l
-@E�

X>�
4mesh�%EEЀ������

 D% 
�
�������&??Ѐ<
� E 
��&Ԁ�'EEЀ������� D%

��
������ (??Ј<
� E 
�0(Ԁ�(??Ѐ<
� E

���(Ԁ�)EEЀ������� D%

��
�������*Ԁ'+??Ѐ<
� E

��7+Ԁ
\ No newline at end of file
+

	�
l��FF��������-�D�

�$0H`lx
+�D�

�=�
rmeshH7FF��������

�
H@E�

�$0H`lx
+�D�

�=�
rmesh+bFF���������jE�

�$0H`lx
+@E�

X>�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-3-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-3-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-3-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-3-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,107 +1,95 @@
-�ò���i�EEЀ������

 D% 

�
������
$<<��������
$�

�$0H`l4mesh%RRЀ<

J

�$0H`l4mesh3
������97
/%Ԁ
}%PPЀ<

J

�$0H`l3
������97


>&Ԁr&RRЀ<
 J

�$0H`l4mesh3
������97
7'Ԁ�'PPЀ<

 
J

�$0H`l3
������97


�'Ԁ
�(RRЈ<J

�$0H`l4mesh3
������97
�(ԀE)PPЀ<0
J


�$0H`l3
������97

*ԀC*RRЀ<@J

�$0H`l4mesh3
������97+Ԁ�+PPЀ<
J

�$0H`l3
������97

�+Ԁ�?AA�������� k?�

�$0H`l$�
4mesh��AA��������

0(��

�$0H`l$�
4mesh�Ԁ%�PPЀ<

@
J


�$0H`l3
������97

�RRЀ<

PJ

�$0H`l4mesh3
������97<�Ԁ��AA��������0���

�$0H`l$�
4mesh-�FF��������P-��

�$0H`l
-��

��
4mesh�7FF��������

`H7�

�$0H`l
-��

��
4mesh��
-EEЀ������

p D% 
�
�������
-??Ѐ<
` E 
�ů
-Ԁ��
-??Ј<
` E 
���
-Ԁ��
-EEЀ������p D%

��
�������
-??Ѐ<@ E 
���
-ԀN�
-??Ѐ<
� E

����
-Ԁ��
-EEЀ������P D%
�-

�������
-Ԁ
�AA��������`�I�

�$0H`l��
4mesh

$FF���������Mf�

�$0H`l
-7�

J�
4mesh
��FF��������

�h��

�$0H`l
-f�

b�
4mesh
��AA��������p���

�$0H`lf�
4mesh
-�FF���������m�

�$0H`l
-��

��
4mesh
�7FF��������

��y�

�$0H`l
-�

�
4mesh�AA�����������

�$0H`l�
4mesh
$FF������������

�$0H`l
-z�

��
4mesh��FF��������

���

�$0H`l
-��

��
4mesh�EEЀ������

� D% 
�
������@�??Ѐ<
� E 
�\�Ԁ��??Ј<
� E 
���??Ј<
� E 
�5�Ԁ�Ԁ��EEЀ������� D%

��
��������??Ѐ<� E 
���Ԁ.�??Ѐ<
� E

����Ԁ��EEЀ������� D%
�^

��������AA���������-&�

�$0H`l��
4mesh��LL�������������� 
��


+�ò���i�EEЀ������



�% 

�
������
$<<��������
$�

�$0H`lxrmesh	&>>Ј<

�$0H`lrmeshq


9u

&Ԁg&<<Ѐ<
�$0H`lq


9u

'Ԁ@'>>Ѐ< 

�$0H`lrmeshq


9u

�'Ԁt)>>Ј<



�$0H`lrmeshq


9u

�)Ԁ
�)<<Ѐ<
0

�$0H`lq


9u
w*Ԁ+<<Ј<
�$0H`lq


9u

+Ԁ{+>>Ѐ<
@

�$0H`lrmeshq


9u
#,Ԁ�,<<Ѐ<

 
�$0H`lq


9u
�,Ԁ
�?AA�������� k?�

�$0H`lx$�
rmesh��AA��������

0(��

�$0H`lx$�
rmeshc�Ԁ�<<Ѐ<

@

�$0H`lq


9u
ɘ>>Ѐ<

P

�$0H`lrmeshq


9u
̙Ԁ��AA��������0���

�$0H`lx$�
rmesh-�FF��������P-��

�$0H`lx
+��

��
rmesh�7FF��������

`H7�

�$0H`lx
+��

��
rmesh
�AA��������@�I�

�$0H`lx��
rmesh

$FF��������`Mf�

�$0H`lx
+J�

7�
rmesh
��FF��������

ph��

�$0H`lx
+f�

b�
rmesh
��AA��������P���

�$0H`lxf�
rmesh
-�FF��������pm�

�$0H`lx
+��

��
rmesh
�7FF��������

��y�

�$0H`lx
+�

�
rmesh�AA��������`��

�$0H`lx�
rmesh
$FF������������

�$0H`lx
+��

z�
rmesh��FF��������

���

�$0H`lx
+��

��
rmesh�EEЀ������

�

�% 
�
������@�??Ѐ<
�

� 
���Ԁ��??Ј<
�

� 
�E�Ԁ��EEЀ�������

�%

��
��������??Ѐ<p

� 
���Ԁ��??Ѐ<
�

�

����Ԁb�EEЀ�������

�%
�-

��������Ԁ��AA���������-&�

�$0H`lx��
rmesh��LL�������������� 
��


 

������
-


��LL��������������
��


+


��LL��������������
��


 

������
-


��FF��������
�I&�

�$0H`l
-�

-&�
4mesh��LL�������
�������
��


+


��FF����������I&�

�$0H`lx
+-&�

�
rmesh��LL�������
�������
��


 

������
-


�Ԁ��LL�<
���

+


�Ԁ��LL�<
���

 



-

�Ԁ
\�LL�<
��

+

�Ԁ
\�LL�<���

 



-

�ԀH����<� ��E�@
+

�ԀH����<� ��E�@
 


-


�
	lX�Ԁ�����<
 
��E�@
+


�
	lX�Ԁ�����<
���E�@
 


-


�
	l/�Ԁp����<
���E�@
+


�
	l/�Ԁp����<
���E�@
 


-


�
	l��LL�������
�������
��


+


�
	l��LL�������
�������
��


 


������
-

�LL�������������0

��


+

�LL�������������

��


 


������
-

I�LL�<� ��

+

I�LL�<� ��

 


-


Y�ԀT�LL��������������
��


+


Y�ԀT�LL��������������
��


 


������
-

��LL�<
@
��

+

��LL�<

��

 


-


r�Ԁ�LL�<

��

+


r�Ԁ�LL�<
���

 


-


)�Ԁ�����<

��E�@
+


)�Ԁ�����<

��E�@
 



-

	�
l��Ԁ
"����<P
��E�@
+

	�
l��Ԁ
"����< 
��E�@
 



-

	�
lc�Ԁ�7FF��������

 
Ȼ&�

�$0H`l
-J&�

F�
4meshzjEEЀ������

0
 D% 
�
�������j??Ѐ<
`
 E 
�EkԀ3l??Ј<
`
 E 
��lԀ�mԀ�mEEЀ������p
 D%

��
�������n??Ѐ<
 E 
�oԀVo??Ѐ<
�
 E

���oԀ�pEEЀ������
 D%
�}

������
���< 
 ��E�
@
+

	�
lc�Ԁ�7FF��������


Ȼ&�

�$0H`lx
+J&�

E�
rmesh
���<� ��E�
@
 


-


�
	l
Ԁk
���<
�
��E�
@
+


�
	l
Ԁk
���<
0
��E�
@
 


-


�
	l�Ԁ����<
@
��E�
@
+


�
	l�Ԁ����<
 
��E�
@
 


-


�
	l�AA��������0
+�-�

�$0H`lJ&�
4mesh�Ԁ�	���<
P
��E�
@
+


�
	l�AA���������+�-�

�$0H`lxJ&�
rmesh�Ԁ�	���<
0
��E�
@
 



 

	�
l�	Ԁ
.
-���<�
��E�
@
+���<@
��E�
@
 



-

	�
lnԀ
$FF���������
��-�

�$0H`l
-�&�

�-�
4mesh��FF��������

`
�\.�

�$0H`l
-�-�

�&�
4mesh$����<@
 ��E�@
+

	�
lnԀ
$FF��������P
��-�

�$0H`lx
+�-�

�&�
rmesh��FF��������

@
�\.�

�$0H`lx
+�-�

�&�
rmesh$����<
 ��E�@
 


-


�
	l4�Ԁ�����<
�
��E�@
+


�
	l4�Ԁ�����<
`
��E�@
 


-


�
	lˣԀ�����<
p
��E�@
+


�
	lˣԀ�����<
P
��E�@
 


-


�
	l��AA��������P
Ko5�

�$0H`l�-�
4mesh��Ԁ&����<
�
��E�@
+


�
	l��AA��������
Ko5�

�$0H`lx�-�
rmesh��Ԁ&����<
`
��E�@
 



-

	�
l6�Ԁ
�����<�
��E�@
+

	�
l6�Ԁ
�����<p
��E�@
 



-

	�
lͬԀ-�FF���������
�5�

�$0H`l
-].�

o5�
4mesh�7FF��������

�
�5�

�$0H`l
-�5�

�.�
4mesh
���<`
 ��E�@
+

	�
lͬԀ-�FF���������
�5�

�$0H`lx
+o5�

].�
rmesh�7FF��������

p
�5�

�$0H`lx
+�5�

�.�
rmesh
���< 
 ��E�@
 


-


�
	l
Ԁk
���<
�
��E�@
+


�
	l
Ԁk
���<
�
��E�@
 


-


�
	l�Ԁ����<
�
��E�@
+


�
	l�Ԁ����<
�
��E�@
 


-


�
	l�AA��������p
k=�

�$0H`l�5�
4mesh�Ԁ
-���<
�
��E�@
+


�
	l�AA��������0
k=�

�$0H`lx�5�
rmesh�Ԁ
+���<
�
��E�@
 



 

	�
l
 Ԁ
m
-���<��E�@
+���<�
��E�@
 



-

	�
l�Ԁ
$FF��������
-=�

�$0H`l
-�5�

=�
4mesh��FF��������

�
(�=�

�$0H`l
--=�

(6�
4mesh�{
EEЀ������

�
 D% 
�
�������{
??Ѐ<
  E 
�J}
Ԁ�}
??Ј<
  E 
��
Ԁ�
??Ј<
  E 
�c�
Ԁ9�
EEЀ������0 D%

��
�������
??Ѐ<�
 E 
�/�
Ԁ}�
??Ѐ<
@ E

��&�
Ԁ�
EEЀ�������
 D%
�

������ԡ���<�
 ��E�@
+

	�
l�Ԁ
$FF���������

-=�

�$0H`lx
+=�

�5�
rmesh��FF��������

�
(�=�

�$0H`lx
+-=�

(6�
rmesh�{
EEЀ������

�


�% 
�
�������{
??Ѐ<
�


� 
�K}
Ԁ�}
??Ј<
�


� 
�|~
??Ј<
�


� 
�$
Ԁ�
Ԁ��
EEЀ�������


�%

��
��������
??Ѐ<@


� 
�ρ
Ԁ�
??Ѐ<
�


�

��ł
Ԁ��
EEЀ������P


�%
�6

������$����<`
 ��E�@
 


-


�
	l�Ԁ;����<
P��E�@
+


�
	l4�Ԁ�����<
�
��E�@
 


-


�
	l{�Ԁ�����<
�
��E�@
+


�
	lˣԀ�����<
�
��E�@
 


-


�
	l��AA���������
��D�

�$0H`l-=�
4meshE�Ԁt����<
�
��E�@
+


�
	l��AA��������p
��D�

�$0H`lx-=�
rmesh�Ԁ����<
�
��E�@
 



-

	�
l��Ԁ
۪���<`��E�@
+

	�
l-�Ԁ
�����<��E�@
 



-

	�
l�Ԁ-�FF��������p-�D�

�$0H`l
-�=�

�D�
4mesh�7FF��������

H@E�

�$0H`l
-�D�

�=�
4mesh�%EEЀ������

 D% 
�
������&??Ѐ<
� E 
��&Ԁ�'??Ј<
� E 
�\(Ԁ')Ԁv)EEЀ������� D%

��
������\*??Ѐ<�
 E 
�l*Ԁ�*??Ѐ<
� E

��c+Ԁ',EEЀ�������
 D%
�

������
\ No newline at end of file
+

	�
lĬԀ-�FF��������-�D�

�$0H`lx
+�D�

�=�
rmesh�7FF��������

�
H@E�

�$0H`lx
+�D�

�=�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-4-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-4-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-proactive-regression-test-4-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-proactive-regression-test-4-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,63 +1,56 @@
-��iu$<<��������
$�

�$0H`l4mesh�$RRЀ<J

�$0H`l4mesh3
������97
\%Ԁ
&PPЀ<

J

�$0H`l3
������97


�&RRЀ<
 J

�$0H`l4mesh3
������97
"(Ԁ
_(RRЈ<J

�$0H`l4mesh3
������97
$)Ԁ�)PPЀ<0
J


�$0H`l3
������97

�)Ԁ�*RRЀ<@J

�$0H`l4mesh3
������97�*Ԁ)+PPЀ<
J

�$0H`l3
������97

�+Ԁk?AA�������� k?�

�$0H`l$�
4mesh��AA��������0���

�$0H`l$�
4mesh��FF��������P-��

�$0H`l
-��

��
4mesh��
-??Ѐ<
` E 
�a�
-??Ј<
` E 
�a�
-EEЀ������p D%

��
��������
-??Ѐ<@ E 
�,�
-Ԁ��
-??Ѐ<
� E

��F�
-EEЀ������P D%
�-

������
kAA��������`�I�

�$0H`l��
4mesh
�$FF���������Mf�

�$0H`l
-7�

J�
4mesh
��AA��������p���

�$0H`lf�
4mesh
��FF���������m�

�$0H`l
-��

��
4meshkAA�����������

�$0H`l�
4mesh�$FF������������

�$0H`l
-z�

��
4mesh��??Ѐ<
� E 
��??Ј<
� E 
���??Ј<
� E 
�A�EEЀ������� D%

��
������c�??Ѐ<� E 
��Ԁ��??Ѐ<
� E

��&�EEЀ������� D%
�^

��������AA���������-&�

�$0H`l��
4meshH�LL�������������� 
��


+��iu$<<��������
$�

�$0H`lxrmesh�$>>Ѐ<

�$0H`lrmeshq


9u

�%>>Ј<

�$0H`lrmeshq


9u

F&Ԁ�&<<Ѐ<
�$0H`lq


9u

�&Ԁ�'>>Ѐ< 

�$0H`lrmeshq


9u

�'Ԁ(<<Ѐ<
�$0H`lq


9u

�)Ԁ
;*<<Ѐ<
0

�$0H`lq


9u
�*<<Ј<
�$0H`lq


9u

G+Ԁ�+>>Ѐ<
@

�$0H`lrmeshq


9u
�,Ԁ
k?AA�������� k?�

�$0H`lx$�
rmesh��AA��������0���

�$0H`lx$�
rmesh��FF��������P-��

�$0H`lx
+��

��
rmesh
kAA��������@�I�

�$0H`lx��
rmesh
�$FF��������`Mf�

�$0H`lx
+J�

7�
rmesh
��AA��������P���

�$0H`lxf�
rmesh
��FF��������pm�

�$0H`lx
+��

��
rmeshkAA��������`��

�$0H`lx�
rmesh�$FF������������

�$0H`lx
+��

z�
rmesh��??Ѐ<
�

� 
�	�??Ј<
�

� 
��EEЀ�������

�%

��
������*�??Ѐ<p

� 
���Ԁb�??Ѐ<
�

�

����EEЀ�������

�%
�-

��������AA���������-&�

�$0H`lx��
rmeshH�LL�������������� 
��


 

������
-


s�LL��������������
��


+


s�LL��������������
��


 

������
-


�FF��������
�I&�

�$0H`l
-�

-&�
4mesh2�Ԁ
��LL�<
��

+


�FF����������I&�

�$0H`lx
+-&�

�
rmesh2�Ԁ
��LL�<���

 



-

��ԀD����<� ��E�@
+

��ԀD����<� ��E�@
 


-


�
	l��Ԁ�����<
 
��E�@
+


�
	l��Ԁ�����<
���E�@
 


-


�
	l��LL�������������0

��


+


�
	l��LL�������������

��


 


������
-

��LL�<� ��

+

��LL�<� ��

 


-


��Ԁ��LL��������������
��


+


��Ԁ��LL��������������
��


 


������
-

6�LL�<
@
��

+

6�LL�<

��

 


-


��Ԁ
'����<P
��E�@
+


��Ԁ
'����< 
��E�@
 



-

	�
l7�Ԁk??Ѐ<
`
 E 
��l??Ј<
`
 E 
�jnEEЀ������p
 D%

��
�������n??Ѐ<
 E 
�5oԀ�o??Ѐ<
�
 E

��NpEEЀ������
 D%
�}

���������< 
 ��E�
@
+

	�
l7�Ԁ���<� ��E�
@
 


-


�
	l@
Ԁo���<
�
��E�
@
+


�
	l@
Ԁo���<
0
��E�
@
 


-


�
	lkAA��������0
+�-�

�$0H`lJ&�
4mesh
-Ԁ
2���<�
��E�
@
+


�
	lkAA���������+�-�

�$0H`lxJ&�
rmesh
+Ԁ
2���<@
��E�
@
 



-

	�
lBԀ�$FF���������
��-�

�$0H`l
-�&�

�-�
4mesh ����<@
 ��E�@
+

	�
lBԀ�$FF��������P
��-�

�$0H`lx
+�-�

�&�
rmesh ����<
 ��E�@
 


-


�
	l`�Ԁ�����<
�
��E�@
+


�
	l`�Ԁ�����<
`
��E�@
 


-


�
	l��AA��������P
Ko5�

�$0H`l�-�
4meshb�Ԁ
�����<�
��E�@
+


�
	l��AA��������
Ko5�

�$0H`lx�-�
rmeshb�Ԁ
�����<p
��E�@
 



-

	�
l��Ԁ��FF���������
�5�

�$0H`l
-].�

o5�
4mesh���<`
 ��E�@
+

	�
l��Ԁ��FF���������
�5�

�$0H`lx
+o5�

].�
rmesh���< 
 ��E�@
 


-


�
	l@
Ԁo���<
�
��E�@
+


�
	l@
Ԁo���<
�
��E�@
 


-


�
	lkAA��������p
k=�

�$0H`l�5�
4meshB
-Ԁ
q���<��E�@
+


�
	lkAA��������0
k=�

�$0H`lx�5�
rmeshB
+Ԁ
q���<�
��E�@
 



-

	�
l�Ԁ�$FF��������
-=�

�$0H`l
-�5�

=�
4mesh,|
??Ѐ<
  E 
�~
??Ј<
  E 
�&�
??Ј<
  E 
���
EEЀ������0 D%

��
������ρ
??Ѐ<�
 E 
�\�
Ԁ�
??Ѐ<
@ E

��u�
EEЀ�������
 D%
�

������ ����<�
 ��E�@
+

	�
l�Ԁ�$FF���������

-=�

�$0H`lx
+=�

�5�
rmesh,|
??Ѐ<
�


� 
�~
??Ј<
�


� 
��~
??Ј<
�


� 
�0�
EEЀ�������


�%

��
������R�
??Ѐ<@


� 
���
Ԁ��
??Ѐ<
�


�

���
EEЀ������P


�%
�6

������ ����<`
 ��E�@
 


-


�
	l�Ԁ?����<
P��E�@
+


�
	l`�Ԁ�����<
�
��E�@
 


-


�
	l��AA���������
��D�

�$0H`l-=�
4mesh��Ԁ
߫���<`��E�@
+


�
	l��AA��������p
��D�

�$0H`lx-=�
rmeshY�Ԁ
�����<��E�@
 



-

	�
l�Ԁ��FF��������p-�D�

�$0H`l
-�=�

�D�
4mesh�&??Ѐ<
� E 
� (??Ј<
� E 
��)EEЀ������� D%

��
������*??Ѐ<�
 E 
��*Ԁ'+??Ѐ<
� E

���+EEЀ�������
 D%
�

������
\ No newline at end of file
+

	�
l��Ԁ��FF��������-�D�

�$0H`lx
+�D�

�=�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-0-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-0-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-0-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-0-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,76 +1,126 @@
-�ò���iC�RRЀ<J

�$0H`l4mesh3
������97
b�Ԁ[�Ԁ
�PPЀ<
J

�$0H`l3
������97

�AA�������� ���

�$0H`l��
4mesh%�RRЀ<J

�$0H`l4mesh3
������97
��Ԁ��PPЀ<0
J


�$0H`l3
������97

��Ԁ��RRЀ<@J

�$0H`l4mesh3
������97��Ԁ��PPЀ<
J

�$0H`l3
������97

��ԀJO
AA�������� JO
�

�$0H`l��
4mesh+bFF��������P�a�

�$0H`l
-7�

O
�
4meshj�AA��������0j��

�$0H`lb�
4mesh
�FF��������`��

�$0H`l
-��

��
4mesh
JO
AA��������@���

�$0H`l�
4mesh
+bFF��������p��

�$0H`l
-z�

��
4mesh
j�AA��������P�2�

�$0H`l��
4mesh�FF���������E�

�$0H`l
-z�

3�
4meshJO
AA��������`���

�$0H`lE�
4mesh+bFF���������3�&�

�$0H`l
-K�

��
4meshj�AA��������p�t'�

�$0H`l�&�
4mesh.LL��������������
-��


+�ò���i'�>>Ѐ<

�$0H`lrmeshq


9u

-�>>Ј<

�$0H`lrmeshq


9u

��AA�����������

�$0H`lx��
rmesh��>>Ѐ<

�$0H`lrmeshq


9u

��>>Ј<

�$0H`lrmeshq


9u

��>>Ј<

�$0H`lrmeshq


9u

��>>Ј<

�$0H`lrmeshq


9u

��>>Ј<

�$0H`lrmeshq


9u

��>>Ј<

�$0H`lrmeshq


9u

��>>Ј<

�$0H`lrmeshq


9u

c�Ԁ��<<Ѐ< 
�$0H`lq


9u
7
>>Ѐ<0

�$0H`lrmeshq


9u

8
ԀJO
AA��������JO
�

�$0H`lx��
rmesh�i
>>Ѐ< 

�$0H`lrmeshq


9u

2j
Ԁ�j
<<Ѐ<@

�$0H`lq


9u
�j
Ԁ�k
>>Ѐ<P

�$0H`lrmeshq


9u
�k
Ԁl
<<Ѐ<0
�$0H`lq


9u
�l
Ԁ#bAA��������`�a�

�$0H`lx��
rmeshj�AA��������@j��

�$0H`lxb�
rmesh
�FF��������p��

�$0H`lx
+��

��
rmesh
J/
AA��������P�q�

�$0H`lx�
rmesh
+bFF�����������

�$0H`lx
+��

q�
rmesh
j�AA��������`��

�$0H`lx��
rmeshaLL��������������
+
��


 
 

������
-


YLL��������������
-��


+


�LL�������������p
+
��


 
 

������
-


(EEЀ������� D% 
�

-`EEЀ������� D%

��

-�
-Ԁc??Ѐ<� E��
-sԀ�LL�<
-� ��

+


[EEЀ�������

�% 
�

+�
EEЀ�������

�%

��

+�Ԁx??Ѐ<�

���
+�Ԁ�LL�<
+� ��

 



 
-

b
LL�<
-� ��

+

wLL�<
+� ��

 



 
-

Ԁ�LL�<
-���

+

4Ԁ�LL�<
+���

 



 
-

�Ԁ�``�<�
+

2 Ԁ� ``�<�
 ��E0@
 


-


�
	�Ԁ�Ԁc``�<�
+


�
	!Ԁ}4LL�������������� 
��


+


������
+

�5LL��������������
��


+


������
+

<=Ԁ�=LL�<�
+��

+
+


+


�=ԀN>``�<
+� ��E0@
+



+

	�
#?Ԁ�?``�<
+
��E0@
+



+

	�
�FF��������
E�

�$0H`lx
+��

�
rmeshJ/
AA���������ʳ�

�$0H`lxE�
rmesh�Ԁ��``�< 

 ��E0
@
 


-


�
	sԀ�Ԁ�``�<

+


�
	ƥԀ�``�<
+� ��E0
@
+



+

	�
�Ԁ��``�<
+0
��E0
@
+



+

	�
+bFF��������@
3�&�

�$0H`lx
+s�

��
rmeshj�AA����������T'�

�$0H`lx�&�
rmeshd�//Ѐ<P


�

+t�Ԁ�FF��������`
S�.�

�$0H`lx
+'�

U'�
rmeshJ/
AA���������
+�.�

�$0H`lx�.�
rmesh%EEЀ������p


�%
+��
9%??Ѐ<


� 
+�&??Ј<


� 
+��'??Ј<


� 
+�Y(Ԁ)??Ј<�


�

+��*??Ј<�


�

+��2+??Ј<�


�

+���0Ԁ�1``�<�

 ��E0@
 


-


�
	�Ԁ**LL�������������� 
��


-


������
-

V+LL�������������

��


-


������
-

�FF�������� 
S�.�

�$0H`l
-�&�

u'�
4meshJO
AA���������
-/�

�$0H`l�.�
4meshR�Ԁ�``�<0

+


�
	�1Ԁ)2``�<
+
 ��E0@
+



+

	�
�2Ԁ4``�<
+�
��E0@
+



+

	�
M5``�<
+�
��E0@
+



+

	�
�Ԁ��``�<�

 ��E0@
 


-


�
	%�Ԁ+bFF��������@
s(6�

�$0H`l
-�.�

/�
4meshj�AA���������*�6�

�$0H`l(6�
4mesh3Ԁ{3,,Ѐ<P
 F

-�3Ԁ�LL�������������� ��


-


������
-

�LL�������������`
��


-


������
-

�FF��������p
��=�

�$0H`l
-�.�

/�
4mesh��22Ѐ<�
J
4mesh7
��ԀK�RRЀ<�
J

�$0H`l4mesh3
������97B�Ԁ��22Ѐ<�
J
4mesh7�M
22Ѐ<�
J
4mesh7
�M
Ԁ5N
22Ѐ<�J
4mesh7
�N
ԀJO
AA��������
JX>�

�$0H`l�=�
4mesheP
RRЀ<�
J

�$0H`l4mesh3
������97uP
Ԁ�P
22Ѐ<
J
4mesh7
\Q
Ԁ�R
22Ј<�
J
4mesh7
�R
Ԁ6<<���������
�>E�

�$0H`l4mesh=6RRЀ< 
J

�$0H`l4mesh3
������97q7RRЈ< 
J

�$0H`l4mesh3
������97�8RRЈ< 
J

�$0H`l4mesh3
������97�9RRЈ< 
J

�$0H`l4mesh3
������97�:RRЈ< 
J

�$0H`l4mesh3
������97<RRЈ< 
J

�$0H`l4mesh3
������97	=RRЈ< 
J

�$0H`l4mesh3
������97khRRЀ<�
J

�$0H`l4mesh3
������97�iԀj�AA��������0
j�E�

�$0H`l
?E�
4mesh��RRЀ<J

�$0H`l4mesh3
������97��Ԁ��PPЀ<@

J


�$0H`l3
������97
��Ԁ�RRЀ<P
J

�$0H`l4mesh3
������97O�RRЈ<P
J

�$0H`l4mesh3
������97z�RRЈ<P
J

�$0H`l4mesh3
������97��RRЈ<P
J

�$0H`l4mesh3
������97��RRЈ<P
J

�$0H`l4mesh3
������97��RRЈ<P
J

�$0H`l4mesh3
������97��RRЈ<P
J

�$0H`l4mesh3
������97�		22Ѐ<J
4mesh7s	Ԁ�r	22Ѐ< J
4mesh7�r	Ԁ"s	22Ѐ<`
J
4mesh7�s	Ԁ�LL�������������p
 ��


-


������
-

��<<��������0�M�

�$0H`l4mesh�RRЀ<�
J

�$0H`l4mesh3
������976�RRЈ<�
J

�$0H`l4mesh3
������974�RRЈ<�
J

�$0H`l4mesh3
������97_�RRЈ<�
J

�$0H`l4mesh3
������97f�RRЈ<�
J

�$0H`l4mesh3
������97��RRЈ<�
J

�$0H`l4mesh3
������97��Ԁr�PPЀ<@
J

�$0H`l3
������97
��RRЈ<�
J

�$0H`l4mesh3
������97��ԀZ�RRЀ<PJ

�$0H`l4mesh3
������97y�Ԁ:�PPЀ<`
J

�$0H`l3
������97
J�Ԁ<�RRЀ<pJ

�$0H`l4mesh3
������97L�Ԁ��PPЀ<�

J

�$0H`l3
������97
[�ԀJW
AA���������
��M�

�$0H`lM�
4mesh+�FF�����������T�

�$0H`l
-�T�
�M�
4meshj�AA���������
�CU�

�$0H`l�T�
4mesh�LL��������������
 ��


-


������
-

�LL����������������


-


������
-

�FF���������v\�

�$0H`l
-<\�
DU�
4meshJW
AA���������
��\�

�$0H`lv\�
4mesh+�FF���������3d�

�$0H`l
-�c�
DU�
4mesh��22Ѐ<�J
4mesh7�ԀU�22Ѐ<�
J
4mesh7��Ԁj�AA���������
�d�

�$0H`ld�
4mesh��RRЀ<�J

�$0H`l4mesh3
������97	��Ԁ��22Ѐ<J
4mesh7	|�Ԁ��22Ј<�J
4mesh7	��Ԁ�AA���������S�k�

�$0H`l~k�
4mesh%�RRЀ<J

�$0H`l4mesh3
������97��Ԁ��PPЀ<
J
	
�$0H`l3
������97

-��Ԁ��RRЀ<J

�$0H`l4mesh3
������97
-��Ԁ��PPЀ< 
J

�$0H`l3
������97

-��ԀJ7
AA��������0
-l�

�$0H`l�k�
4mesh+�FF�������� sYs�

�$0H`l
-s�
	l�
4meshj�AA��������@*�s�

�$0H`lYs�
4meshJ7
AA��������PJI{�

�$0H`lYs�
4mesh�22Ѐ<`J
4mesh7
-��Ԁ�22Ј<@J
4mesh7
-��Ԁ��FF��������P����

�$0H`l
-a��
	I{�
4meshߊRRЀ<pJ

�$0H`l4mesh3
������97��Ԁ4�22Ѐ<`J
4mesh7
-D�Ԁ��22Ѐ<�J
4mesh7
-+�Ԁj�AA���������jւ�

�$0H`l���
4mesh��RRЀ<pJ

�$0H`l4mesh3
������97��Ԁ��22Ѐ<�J
4mesh7|�Ԁ��22Ј<�J
4mesh7��Ԁ	�AA����������<��

�$0H`l��
4mesh	%�RRЀ<�J

�$0H`l4mesh3
������97	
�RRЈ<�J

�$0H`l4mesh3
������97	��Ԁ	x�PPЀ<�
J

�$0H`l3
������97
	��Ԁ	��AA����������?��

�$0H`l=��
4mesh	��RRЀ<�J

�$0H`l4mesh3
������97	
-�Ԁ	a�PPЀ<�
J

�$0H`l3
������97
	"�Ԁ	+�FF����������ݑ�

�$0H`l
-���
@��
4mesh	j�AA������������

�$0H`lޑ�
4mesh
\ No newline at end of file
+


�
	ƥԀ�``�<
+ 
 ��E0@
+



+

	�
�Ԁ3�``�<
+�
��E0@
+



+

	�
+bFF���������
s(6�

�$0H`lx
+�.�

U'�
rmesh��//Ѐ<�


�
��AA��������0
*�6�

�$0H`lx(6�
rmesh%�--Ј<�
rmeshu
45�Ԁ��--Ѐ<@
rmeshu
7��--Ј<@
rmeshu
7��--Ј<@
rmeshu
79�Ԁ��EEЀ������

�%
+��
�AA����������=�

�$0H`lxV6�
rmesh%�>>Ѐ<P


�$0H`lrmeshq


9u
��ԀH�<<Ј< 
�$0H`lq


9uX�Ԁ.�>>Ѐ<0

�$0H`lrmeshq


9u
>�Ԁ��<<Ѐ<`


�$0H`lq


9u1�ԀJW
AA��������p
J`>�

�$0H`lx
�=�
rmesh+bFF��������@�jE�

�$0H`lx
+�=�
`>�
rmeshj�AA���������
j
F�

�$0H`lx
kE�
rmeshB�	EEЀ������P

�%
+��
d�	??Ѐ<�


� 
+�
�	Ԁ��	??Ѐ<`

�

+����	Ԁ��	``�<p
+��E0@
+


+


�
	��	Ԁ��	``�<
+�
 ��E0@
+



+

	�
��	Ԁ�	``�<
+���E0@
+



+

	�
n�	``�<
+���E0@
+



+

	�
��	``�<
+���E0@
+



+

	�
��	ԀF�	``�<
+���E0@
+



+

	�
�	``�<�
+��E0@
+


+


�
	)�	Ԁ��	``�<
+�
 ��E0@
+



+

	�
�	``�<
+�
 ��E0@
+



+

	�
��	Ԁ��	``�<
+���E0@
+



+

	�
JW
AA���������
��M�

�$0H`lx
kE�
rmesh�_--Ѐ<�
rmeshu4|`Ԁ�`--Ѐ<�rmeshu7aԀ+bFF����������T�

�$0H`lx
+9M�
�M�
rmeshMb>>Ѐ<�


�$0H`lrmeshq


9u
Ac>>Ј<�


�$0H`lrmeshq


9u
�cԀ`d--Ѐ<�rmeshu4pdԀ�d--Ѐ<�
rmeshu7aeԀj�AA���������#U�

�$0H`lx�T�
rmeshi�>>Ѐ<�

�$0H`lrmeshq


9u
y�Ԁ��--Ѐ<rmeshu4X�Ԁ��--Ѐ<rmeshu7��Ԁs�	//Ѐ<

�
*=Ԁ�AA�������� N\�

�$0H`lx9M�
rmesh%�>>Ѐ< 

�$0H`lrmeshq


9u
��ԀX�<<Ѐ<0
�$0H`lq


9uh�Ԁ5�>>Ѐ<@

�$0H`lrmeshq


9u
E�Ԁ��<<Ѐ<0
�$0H`lq


9u8�Ԁ��--Ѐ<Prmeshu
4��ԀJ#
AA��������@ʰ\�

�$0H`lxN\�
rmesh�bԀxc<<Ѐ<p
�$0H`lq


9u^d>>Ѐ<�

�$0H`lrmeshq


9u
#fԀj�AA��������P�d�

�$0H`lxN\�
rmeshþ--Ѐ<`rmeshu4T�Ԁʿ--Ѐ<�rmeshu7ڿԀJ�<<��������p
+�k�

�$0H`lxrmesh#bAA���������s1s�

�$0H`lx�k�
rmeshEb>>Ѐ<�

�$0H`lrmeshq


9u
8c>>Ј<�

�$0H`lrmeshq


9u
�cԀkd<<Ѐ<�
�$0H`lq


9u{dԀ!f>>Ј<�

�$0H`lrmeshq


9u
1fԀf<<Ѐ<�
�$0H`lq


9u$gԀj�AA���������*ds�

�$0H`lx1s�
rmesh�FF�����������z�

�$0H`lx
+�k�
ds�
rmeshJ
AA���������J{�

�$0H`lx�z�
rmesh�
--Ѐ<�rmeshu4�
Ԁ'
>>Ѐ<

�$0H`lrmeshq


9u
 
Ԁ� 
--Ѐ<rmeshu7#bAA�������� �s��

�$0H`lx{�
rmesh�bԀ3eԀj�AA���������j���

�$0H`lxt��
rmesh	�FF��������P���

�$0H`lx
+���
���
rmesh	J
AA����������_��

�$0H`lx��
rmesh	+bFF��������`��

�$0H`lx
+_��
V��
rmesh	j�AA������������

�$0H`lx���
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-1-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-1-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-1-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-1-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,112 +1,206 @@
-�ò���i %RRЀ<J

�$0H`l4mesh3
������97
?&Ԁ8'Ԁ�'PPЀ<
J

�$0H`l3
������97


�(PPЈ<
J

�$0H`l3
������97


��AA�������� (��

�$0H`l$�
4mesh��RRЀ<J

�$0H`l4mesh3
������97
�Ԁ%�PPЀ<0
J


�$0H`l3
������97

5�Ԁ�RRЀ<@J

�$0H`l4mesh3
������97.�Ԁ|�PPЀ<
J

�$0H`l3
������97

=�Ԁ��AA�������� ���

�$0H`l��
4mesh��RRЀ<J

�$0H`l4mesh3
������97
��Ԁ�PPЀ<0
J


�$0H`l3
������97

��Ԁ
-�RRЀ<@J

�$0H`l4mesh3
������97��Ԁu�PPЀ<
J

�$0H`l3
������97

��Ԁ�O
AA�������� JO
�

�$0H`l��
4mesh�7FF��������PH7�

�$0H`l
-��

��
4mesh�aFF��������P�a�

�$0H`l
-7�

O
�
4mesh��AA��������0j��

�$0H`lb�
4mesh
��FF��������`h��

�$0H`l
-6�

b�
4mesh
��FF��������`��

�$0H`l
-��

��
4mesh
�O
AA��������@���

�$0H`l�
4mesh
6Ԁ
�622Ѐ<pJ
4mesh7


�7Ԁ
L8FF����������y�

�$0H`l
-�

�
4mesh
39Ԁ
�922Ѐ<�J
4mesh7

�:Ԁ
�aFF��������p��

�$0H`l
-z�

��
4mesh
��AA��������P�2�

�$0H`l��
4mesh(-RRЀ<�J

�$0H`l4mesh3
������97G.ԀI/Ԁ�/PPЀ<�
J

�$0H`l3
������97
��FF���������E�

�$0H`l
-z�

3�
4mesh��FF����������J�

�$0H`l
-
E�
��
4mesh�O
AA��������`���

�$0H`lE�
4mesh�aFF���������3�&�

�$0H`l
-K�

��
4mesh�gFF�����������&�

�$0H`l
-
�&�
R&�
4mesh��AA��������p�t'�

�$0H`l�&�
4mesh�LL��������������
-��


+�ò���i%>>Ѐ<

�$0H`lrmeshq


9u

'>>Ј<

�$0H`lrmeshq


9u

�'>>Ј<

�$0H`lrmeshq


9u

�(>>Ј<

�$0H`lrmeshq


9u

�)>>Ј<

�$0H`lrmeshq


9u

��AA��������(��

�$0H`lx$�
rmesh��>>Ѐ<

�$0H`lrmeshq


9u

��>>Ј<

�$0H`lrmeshq


9u

��>>Ј<

�$0H`lrmeshq


9u

̙>>Ј<

�$0H`lrmeshq


9u

ۚ>>Ј<

�$0H`lrmeshq


9u

�>>Ј<

�$0H`lrmeshq


9u

ޜ>>Ј<

�$0H`lrmeshq


9u

��>>Ѐ< 

�$0H`lrmeshq


9u

��>>Ј< 

�$0H`lrmeshq


9u

��>>Ј< 

�$0H`lrmeshq


9u

�AA�����������

�$0H`lx��
rmesh'�>>Ј<0

�$0H`lrmeshq


9u
7�Ԁ��<<Ѐ< 
�$0H`lq


9u
*�Ԁ��--Ѐ<@rmeshu
4��Ԁ�6
>>Ѐ<0

�$0H`lrmeshq


9u

A7
Ԁ�7
<<Ѐ<P

�$0H`lq


9u
�7
Ԁ�i
>>Ѐ< 

�$0H`lrmeshq


9u

j
ԀTj
<<Ѐ<@

�$0H`lq


9u
�j
Ԁ6k
>>Ѐ<P

�$0H`lrmeshq


9u
�k
Ԁil
<<Ѐ<0
�$0H`lq


9u
yl
Ԁ$�>>Ѐ<`

�$0H`lrmeshq


9u
$�>>Ј<`

�$0H`lrmeshq


9u
3�>>Ј<`

�$0H`lrmeshq


9u
�>>Ј<`

�$0H`lrmeshq


9u
6>>Ѐ<p

�$0H`lrmeshq


9u
7>>Ј<p

�$0H`lrmeshq


9u
�7>>Ј<p

�$0H`lrmeshq


9u
�8>>Ј<p

�$0H`lrmeshq


9u
�<--Ѐ<�rmeshu4�aAA��������`�a�

�$0H`lx��
rmesh�gFF���������Hg�

�$0H`lx
+
b�
��
rmesh�hԀ
i--Ѐ<�rmeshu4jԀ��AA��������@j��

�$0H`lxb�
rmesh
->>Ѐ<�

�$0H`lrmeshq


9u

.Ԁ
�.Ԁ
/<<Ѐ<�
�$0H`lq


9u
��FF���������h��

�$0H`lx
+
b�
n�
rmesh
��FF��������p��

�$0H`lx
+��

��
rmesh
�/
AA��������P�q�

�$0H`lx�
rmesh
�aFF�����������

�$0H`lx
+��

q�
rmesh
�gFF������������

�$0H`lx
+
��
��
rmesh
��AA��������`��

�$0H`lx��
rmesh�
+LL��������������
+
��


 
 

������
-


�LL��������������
-��


+


�
+LL��������������
+
��


 
 

������
-


�LL��������������
-��


+



LL�������������p
+
��


 
 

������
-


�EEЀ������� D% 
�

-�EEЀ������� D%

��

-$EEЀ������� D%
�,


-
-Ԁ�
-??Ѐ<
 E�)
-�
-Ԁ�
-??Ѐ<� E��
-�Ԁ�
LL�<
-� ��

+


�EEЀ�������

�% 
�

+
EEЀ�������

�%

��

+ Ԁ�??Ѐ<


���

+�Ԁ??Ѐ<�

���
+�Ԁ�LL�<
+� ��

 



 
-

�
ԀJLL�<
-���

+

Ԁ_LL�<
+���

 



 
-

Ԁ�Ԁ�``�< 

+

Ԁ�LL�<
+ 
��

+



+
+

3Ԁ�``�<0

 ��E0@
 


-


�
	�Ԁ
-``�<�
+


�
	 Ԁ] ``�<�
 ��E0@
 


-


�
	�Ԁ�Ԁd``�<0

+


�
	2!Ԁ�4LL�������������� 
��


+


������
+

)5LL��������������
��


+


������
+

U6LL�������������@

��


+


������
+

l:Ԁ=LL�<P

+��

+
+


+


=Ԁg=LL�<�
+��

+
+


+


$>Ԁ�>``�<
+� ��E0@
+



+

	�
�>Ԁ`?``�<
+
��E0@
+



+

	�
5@Ԁ�@``�<
+`
��E0@
+



+

	�
��FF��������
E�

�$0H`lx
+��

�
rmesh��FF��������p
�r�

�$0H`lx
+
E�
��
rmesh�/
AA���������ʳ�

�$0H`lxE�
rmesh��Ԁ��``�<�

 ��E0
@
 


-


�
	tԀ�``�<�
+


�
	ǤԀ�``�< 

 ��E0
@
 


-


�
	�Ԁ�Ԁ�``�<@

+


�
	�Ԁ��``�<
+� ��E0
@
+



+

	�
ƦԀ\�``�<
+0
��E0
@
+



+

	�
1�Ԁ�``�<
+�
��E0
@
+



+

	�
��``�<
+�
��E0
@
+



+

	�
�aFF��������@
3�&�

�$0H`lx
+s�

��
rmesh��FF���������
�'�

�$0H`lx
+
�&�

+&�
rmesh��AA����������T'�

�$0H`lx�&�
rmesh4�Ԁ��//Ѐ<�


�

+��Ԁ�//Ѐ<P


�

+��Ԁ��FF��������`
S�.�

�$0H`lx
+'�

U'�
rmesh��FF���������
�.�

�$0H`lx
+
�.�
�-�
rmeshT$EEЀ�������


�%
+�
�$EEЀ������p


�%
+��
�&??Ј<


� 
+��&Ԁ�&??Ѐ<�


�

+��(??Ј<


� 
+�-(Ԁ�(??Ј<�


�

+���)??Ј<�


�

+���*??Ј<�


�

+��o+Ԁ�+??Ѐ<�


�
+�-
0Ԁ�0``�<�

 ��E0@
 


-


�
	�Ԁ%``�<

+


�
	�0Ԁ*1``�<�

 ��E0@
 


-


�
	�Ԁ�*LL�������������� 
��


-


������
-

�*LL�������������

��


-


������
-

,LL�������������P

��


-


������
-

��FF�������� 
S�.�

�$0H`l
-�&�

u'�
4mesh��FF��������`
�.�

�$0H`l
-
�.�
�-�
4mesh�O
AA���������
-/�

�$0H`l�.�
4meshS�Ԁ�``�<p

+


�
	�1Ԁ�2``�<
+
 ��E0@
+



+

	�
�2Ԁh3``�<
+�
��E0@
+



+

	�
�4``�<
+�
��E0@
+



+

	�
�5Ԁ8``�<
+��E0@
+



+

	�
��Ԁ��``�<
 ��E0@
 


-


�
	&�Ԁ}�``�<0

+


�
	ǤԀ�``�<�

 ��E0@
 


-


�
	R�Ԁ�aFF��������@
s(6�

�$0H`l
-�.�

/�
4meshR2Ԁ�2,,Ѐ<�
 F

-�2Ԁ&3,,Ѐ<P
 F

-�3Ԁ#LL�������������� ��


-


������
-

NLL�������������`
��


-


������
-

zLL��������������
��


-


������
-

��FF��������p
��=�

�$0H`l
-�.�

/�
4mesh`�22Ѐ<�
J
4mesh7
��Ԁw�22Ѐ<�
J
4mesh7
��Ԁ��FF���������
(�=�

�$0H`l
-
�=�
	=�
4mesh��RRЀ<�
J

�$0H`l4mesh3
������97��Ԁ�22Ѐ<�
J
4mesh7�Ԁc�22Ѐ<�
J
4mesh7��Ԁ{M
22Ѐ<�
J
4mesh7
N
Ԁ�N
22Ѐ<�J
4mesh7
�N
Ԁ�O
AA��������
JX>�

�$0H`l�=�
4mesh�O
RRЀ<�
J

�$0H`l4mesh3
������97�P
Ԁ Q
22Ѐ<
J
4mesh7
0Q
Ԁ�Q
22Ѐ<�
J
4mesh7
wR
22Ј<�
J
4mesh7
S
Ԁ}
66Ѐ<�
 F�5<<���������
�>E�

�$0H`l4mesh�gFF��������HpE�

�$0H`l
-�D�
?E�
4mesh�gRRЀ<�
J

�$0H`l4mesh3
������97�hԀMiPPЀ<
J

�$0H`l3
������97
]iԀ��AA��������0
j�E�

�$0H`l
?E�
4mesh��RRЀ<J

�$0H`l4mesh3
������97��Ԁh�PPЀ<@

J


�$0H`l3
������97
x�ԀM		22Ѐ<J
4mesh7�		Ԁ6	22Ј<0J
4mesh7F	Ԁhr	22Ѐ< J
4mesh7
s	Ԁs	22Ѐ<`
J
4mesh7�s	Ԁ#LL�������������p
 ��


-


������
-

��<<��������0�M�

�$0H`l4mesh��RRЈ<@J

�$0H`l4mesh3
������97��Ԁ��PPЀ<@
J

�$0H`l3
������97
��Ԁb�RRЈ<�
J

�$0H`l4mesh3
������97r�Ԁ��RRЀ<PJ

�$0H`l4mesh3
������97��Ԁ=�PPЀ<`
J

�$0H`l3
������97
M�Ԁ��PPЀ<`
J

�$0H`l3
������97
w�Ԁ��RRЀ<pJ

�$0H`l4mesh3
������97y�Ԁ�PPЀ<�

J

�$0H`l3
������97
/�Ԁ�W
AA���������
��M�

�$0H`lM�
4mesh�OFF��������p��T�

�$0H`l
-/L�
M�
4mesh��FF�����������T�

�$0H`l
-�T�
�M�
4mesh��AA���������
�CU�

�$0H`l�T�
4mesh�$22Ѐ<�J
4mesh7�%22Ј<�J
4mesh7�&22Ј<�J
4mesh7�'22Ј<�J
4mesh7�(22Ј<�J
4mesh7�)22Ј<�J
4mesh7�*22Ј<�J
4mesh7#LL��������������
 ��


-


������
-

NLL����������������


-


������
-

zLL����������������


-


������
-

��AA����������;\�

�$0H`l�T�
4mesh��FF���������v\�

�$0H`l
-<\�
DU�
4mesh�OAA�����������c�

�$0H`lv\�
4mesh��FF���������3d�

�$0H`l
-�c�
DU�
4mesh��22Ѐ<�J
4mesh74�Ԁ��22Ѐ<�
J
4mesh7��Ԁ��AA���������
�d�

�$0H`ld�
4mesh��RRЀ<�J

�$0H`l4mesh3
������97	��Ԁ@�22Ѐ<J
4mesh7	P�Ԁ��22Ѐ<�J
4mesh7	p�22Ј<�J
4mesh7		�Ԁ��AA����������}k�

�$0H`ld�
4mesh��AA���������S�k�

�$0H`l~k�
4mesh��RRЀ<J

�$0H`l4mesh3
������97��Ԁ�PPЀ<
J
	
�$0H`l3
������97

-��Ԁ
�RRЀ<J

�$0H`l4mesh3
������97
-��Ԁl�PPЀ< 
J

�$0H`l3
������97

-|�Ԁ�7
AA��������0
-l�

�$0H`l�k�
4mesh�OAA���������s�

�$0H`l�k�
4mesh��FF�������� sYs�

�$0H`l
-s�
	l�
4mesh��AA��������@*�s�

�$0H`lYs�
4mesh��AA���������(�z�

�$0H`lYs�
4mesh��FF��������0��z�

�$0H`l
-�z�
	�s�
4mesh�7
AA��������PJI{�

�$0H`lYs�
4mesh�OAA���������Ha��

�$0H`l�z�
4meshH�22Ѐ<`J
4mesh7
-X�Ԁ��22Ѐ<@J
4mesh7
-��22Ј<@J
4mesh7
-,�ԀE�FF��������P����

�$0H`l
-a��
	I{�
4meshh�RRЀ<pJ

�$0H`l4mesh3
������97x�Ԁ؋22Ѐ<`J
4mesh7
-q�Ԁ�22Ѐ<�J
4mesh7
-��Ԁ��AA���������jւ�

�$0H`l���
4mesh��RRЀ<pJ

�$0H`l4mesh3
������97��Ԁ@�22Ѐ<�J
4mesh7P�Ԁ��22Ѐ<�J
4mesh7j�22Ј<�J
4mesh7�Ԁ	��AA��������h��

�$0H`l���
4mesh	��AA����������<��

�$0H`l��
4mesh	��RRЈ<�J

�$0H`l4mesh3
������97	��Ԁ	��PPЀ<�
J

�$0H`l3
������97
	��Ԁ	>�AA����������?��

�$0H`l=��
4mesh	r�RRЀ<�J

�$0H`l4mesh3
������97	7�Ԁ	��PPЀ<�
J

�$0H`l3
������97
	��Ԁ	�OAA������������

�$0H`l=��
4mesh	��FF����������ݑ�

�$0H`l
-���
@��
4mesh	ېAA������������

�$0H`lޑ�
4mesh
\ No newline at end of file
+


�
	�Ԁ��``�<
+ 
 ��E0@
+



+

	�
ƦԀ��``�<
+�
��E0@
+



+

	�
p�Ԁ3�``�<
+ ��E0@
+



+

	�
�``�<
+ ��E0@
+



+

	�
�aFF���������
s(6�

�$0H`lx
+�.�

U'�
rmesh��FF��������0V6�

�$0H`lx
+
(6�
p5�
rmesh��//Ѐ<�


�
0�Ԁ��//Ѐ<@

�
#�--Ѐ<�
rmeshu
4��--Ј<�
rmeshu
4b�Ԁ��--Ѐ<@
rmeshu
7��Ԁ��--Ј<@
rmeshu
7
�Ԁ��EEЀ������P

�%
+�
�EEЀ������

�%
+��
��AA����������=�

�$0H`lxV6�
rmesh��>>Ѐ<P


�$0H`lrmeshq


9u
��Ԁ��<<Ѐ< 
�$0H`lq


9u��<<Ј< 
�$0H`lq


9u��Ԁ��>>Ѐ<0

�$0H`lrmeshq


9u
k�Ԁ��<<Ѐ<`


�$0H`lq


9u�Ԁ��FF��������`(�=�

�$0H`lx
+
�=�
=�
rmesh�W
AA��������p
J`>�

�$0H`lx
�=�
rmesh�aFF��������@�jE�

�$0H`lx
+�=�
`>�
rmesh��FF��������pH�E�

�$0H`lx
+
kE�
�D�
rmesh��AA���������
j
F�

�$0H`lx
kE�
rmesh�	EEЀ�������

�%
+�
��	EEЀ������P

�%
+��
��	??Ѐ<�


� 
+���	Ԁ/�	??Ѐ<`

�

+����	Ԁf�	??Ѐ<�

�
+�T
��	ԀF�	``�<�
+��E0@
+


+


�
	V�	Ԁ��	``�<p
+��E0@
+


+


�
	��	``�<p
+��E0@
+


+


�
	��	Ԁ��	``�<
+�
 ��E0@
+



+

	�
��	Ԁw�	``�<
+���E0@
+



+

	�
��	``�<
+���E0@
+



+

	�
�	``�<
+���E0@
+



+

	�
@�	``�<
+���E0@
+



+

	�
��	Ԁ��	``�<�
+��E0@
+


+


�
	��	Ԁ��	``�<
+���E0@
+



+

	�
��	ԀF�	``�<
+���E0@
+



+

	�
�	``�<�
+��E0@
+


+


�
	��	``�<�
+��E0@
+


+


�
	V�	Ԁ��	``�<
+�
 ��E0@
+



+

	�
��	Ԁ�	``�<
+���E0@
+



+

	�
��	Ԁ��	``�<
+���E0@
+



+

	�
��FF����������M�

�$0H`lx
+�E�

F�
rmesh��FF���������h9M�

�$0H`lx
+
M�
GL�
rmesh�W
AA���������
��M�

�$0H`lx
kE�
rmesh@`--Ѐ<�
rmeshu4P`Ԁ�`--Ѐ<�rmeshu7/aԀ�aFF����������T�

�$0H`lx
+9M�
�M�
rmesh�c>>Ј<�


�$0H`lrmeshq


9u
�cԀd--Ѐ<�rmeshu4�dԀ%e--Ѐ<�
rmeshu75eԀ��AA���������#U�

�$0H`lx�T�
rmesh��>>Ѐ<�

�$0H`lrmeshq


9u
��Ԁ�--Ѐ<rmeshu4,�Ԁz�--Ѐ<rmeshu7�Ԁ�	//Ѐ<

�
��	Ԁ*�	//Ѐ<

�
)�	//Ј<

�
�	//Ј<

�
ɏ	//Ј<

�
��	//Ј<

�
�<<<Ѐ<

�
+�<Ԁ�=--Ѐ< rmeshu4�>--Ј< rmeshu4P?--Ј< rmeshu4@--Ј< rmeshu4A--Ј< rmeshu4�A--Ј< rmeshu4��AA�������� N\�

�$0H`lx9M�
rmesh��>>Ѐ< 

�$0H`lrmeshq


9u
��Ԁ��<<Ѐ<0
�$0H`lq


9u��Ԁ��>>Ѐ<@

�$0H`lrmeshq


9u
r�Ԁ��<<Ѐ<0
�$0H`lq


9u�Ԁ`�--Ѐ<Prmeshu
4��Ԁg�--Ѐ<0rmeshu
7w�Ԁ�#
AA��������@ʰ\�

�$0H`lxN\�
rmesh�aAA��������`3�c�

�$0H`lx�\�
rmesh�b>>Ѐ<P

�$0H`lrmeshq


9u
�bԀc<<Ѐ<p
�$0H`lq


9u�cԀ�c>>Ѐ<�

�$0H`lrmeshq


9u
�dԀ�e<<Ј<`
�$0H`lq


9u�eԀیAA��������P�d�

�$0H`lxN\�
rmesh��AA��������p�Ld�

�$0H`lx�c�
rmesh�--Ѐ<`rmeshu4(�Ԁv�--Ѐ<�rmeshu7�Ԁ��FF���������S�k�

�$0H`lx
+d�
Md�
rmesh��<<��������p
+�k�

�$0H`lxrmesh�
AA�����������k�

�$0H`lx�k�
rmesh�aAA���������s1s�

�$0H`lx�k�
rmesh�c>>Ј<�

�$0H`lrmeshq


9u
�cԀd<<Ѐ<�
�$0H`lq


9u�dԀ�d>>Ѐ<�

�$0H`lrmeshq


9u
�e>>Ј<�

�$0H`lrmeshq


9u
^fԀ�f<<Ѐ<�
�$0H`lq


9u�fԀ۔AA���������*ds�

�$0H`lx1s�
rmesh��FF�����������z�

�$0H`lx
+�k�
ds�
rmesh�
AA���������J{�

�$0H`lx�z�
rmeshX
--Ѐ<�rmeshu4�
Ԁ_
--Ѐ<�rmeshu7o
Ԁ�
AA���������(0{�

�$0H`lx�z�
rmesh�
>>Ѐ<

�$0H`lrmeshq


9u
c
Ԁ�
--Ѐ<�rmeshu4�
Ԁ@ 
--Ѐ<rmeshu7� 
Ԁ�aAA�������� �s��

�$0H`lx{�
rmesh�b>>Ѐ<�

�$0H`lrmeshq


9u
�bԀc<<Ѐ<0
�$0H`lq


9u	�cԀ�c>>Ѐ<@

�$0H`lrmeshq


9u
	mdԀ�d<<Ѐ<�
�$0H`lq


9u	eԀ��AA���������H���

�$0H`lxt��
rmesh۬AA���������j���

�$0H`lxt��
rmesh	��FF��������P���

�$0H`lx
+���
���
rmesh	�
AA��������hV��

�$0H`lx��
rmesh	�
AA����������_��

�$0H`lx��
rmesh	�aFF��������`��

�$0H`lx
+_��
V��
rmesh	��AA������������

�$0H`lx���
rmesh	۬AA������������

�$0H`lx���
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-2-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-2-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-2-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-2-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,137 +1,222 @@
-��iu$<<��������
$�

�$0H`l4mesh�$RRЀ<J

�$0H`l4mesh3
������97
\%Ԁ&PPЀ<
J

�$0H`l3
������97


&Ԁ�&RRЀ< J

�$0H`l4mesh3
������97
'Ԁb'PPЀ<
J

�$0H`l3
������97


n(PPЈ<
J

�$0H`l3
������97


/)Ԁ~@RRЀ<	0J

�$0H`l4mesh3
������97�ARRЈ<	0J

�$0H`l4mesh3
������97�BRRЈ<	0J

�$0H`l4mesh3
������97�CRRЈ<	0J

�$0H`l4mesh3
������97ERRЈ<	0J

�$0H`l4mesh3
������97FRRЈ<	0J

�$0H`l4mesh3
������97JGRRЈ<	0J

�$0H`l4mesh3
������97(�AA�������� (��

�$0H`l$�
4meshC�RRЀ<J

�$0H`l4mesh3
������97
S�Ԁ��PPЀ<0
J


�$0H`l3
������97

b�Ԁ��RRЀ<@J

�$0H`l4mesh3
������97[�Ԁ
�PPЀ<
J

�$0H`l3
������97

�Ԁ�AA�������� ���

�$0H`l��
4mesh��Ԁ��PPЀ<0
J


�$0H`l3
������97

��RRЀ<@J

�$0H`l4mesh3
������97��Ԁu�RRЈ<	@J

�$0H`l4mesh3
������97��RRЈ<	@J

�$0H`l4mesh3
������97��RRЈ<	@J

�$0H`l4mesh3
������97��RRЈ<	@J

�$0H`l4mesh3
������97��RRЈ<	@J

�$0H`l4mesh3
������97��RRЈ<	@J

�$0H`l4mesh3
������97��22Ѐ<	PJ
4mesh7��RRЀ<	`J

�$0H`l4mesh3
������97ҪRRЈ<	`J

�$0H`l4mesh3
������97�RRЈ<	`J

�$0H`l4mesh3
������97�RRЈ<	`J

�$0H`l4mesh3
������97�RRЈ<	`J

�$0H`l4mesh3
������97�RRЈ<	`J

�$0H`l4mesh3
������97��RRЈ<	`J

�$0H`l4mesh3
������97��FF��������p-��

�$0H`l
-��
��
4mesh��Ԁ	2�PPЀ<	�
J

�$0H`l3
������97
H7FF��������PH7�

�$0H`l
-��

��
4mesh|IRRЀ<	�J

�$0H`l4mesh3
������97zJRRЈ<	�J

�$0H`l4mesh3
������97�KRRЈ<	�J

�$0H`l4mesh3
������97�LRRЈ<	�J

�$0H`l4mesh3
������97�MRRЈ<	�J

�$0H`l4mesh3
������97�NRRЈ<	�J

�$0H`l4mesh3
������97PRRЈ<	�J

�$0H`l4mesh3
������97+bFF��������P�a�

�$0H`l
-7�

O
�
4mesh�gԀ	Ih22Ѐ<	�J
4mesh7�RRЀ<	�J

�$0H`l4mesh3
������97�RRЈ<	�J

�$0H`l4mesh3
������97� RRЈ<	�J

�$0H`l4mesh3
������97"RRЈ<	�J

�$0H`l4mesh3
������97�6FF���������M6�

�$0H`l
-7�
�
4mesh�7Ԁ	R8PPЀ<	�
J

�$0H`l3
������97

\|RRЀ<	�J

�$0H`l4mesh3
������97
Q}RRЈ<	�J

�$0H`l4mesh3
������97
|~RRЈ<	�J

�$0H`l4mesh3
������97
�RRЈ<	�J

�$0H`l4mesh3
������97
��RRЈ<	�J

�$0H`l4mesh3
������97
��RRЈ<	�J

�$0H`l4mesh3
������97
łRRЈ<	�J

�$0H`l4mesh3
������97
(�FF��������`h��

�$0H`l
-6�

b�
4mesh
��Ԁ	
�22Ѐ<	�J
4mesh7
�FF��������`��

�$0H`l
-��

��
4mesh
�URRЀ<	
J

�$0H`l4mesh3
������97
�VԀ	
�WԀ	
\XPPЀ<	

J

�$0H`l3
������97

��FF�������� 
m�

�$0H`l
-7�
��
4mesh
�522Ѐ<0
J
4mesh7


�5Ԁ
;622Ѐ<pJ
4mesh7


�6Ԁ
722Ј<0
J
4mesh7


�7Ԁ
�7FF����������y�

�$0H`l
-�

�
4mesh
�8RRЀ<@
J

�$0H`l4mesh3
������97
9Ԁ
U922Ѐ<�J
4mesh7

�9Ԁ
u:22Ѐ<P
J
4mesh7

�:Ԁ
+bFF��������p��

�$0H`l
-z�

��
4mesh�	LL�������������`

-
��


+��iu$<<��������
$�

�$0H`lxrmesh�$>>Ѐ<

�$0H`lrmeshq


9u

�%>>Ј<

�$0H`lrmeshq


9u

�&>>Ј<

�$0H`lrmeshq


9u

|'>>Ј<

�$0H`lrmeshq


9u

�(>>Ј<

�$0H`lrmeshq


9u

�)>>Ј<

�$0H`lrmeshq


9u

�*>>Ј<

�$0H`lrmeshq


9u

j@>>Ѐ<	

�$0H`lrmeshq


9u

RB>>Ј<	

�$0H`lrmeshq


9u

(�AA��������(��

�$0H`lx$�
rmeshu�>>Ѐ< 

�$0H`lrmeshq


9u

i�>>Ј< 

�$0H`lrmeshq


9u

o�>>Ј< 

�$0H`lrmeshq


9u

Q�>>Ј< 

�$0H`lrmeshq


9u

W�>>Ј< 

�$0H`lrmeshq


9u

��AA�����������

�$0H`lx��
rmesh��>>Ј< 

�$0H`lrmeshq


9u

��>>Ј< 

�$0H`lrmeshq


9u

��>>Ѐ<0

�$0H`lrmeshq


9u
��>>Ј<0

�$0H`lrmeshq


9u
��>>Ј<0

�$0H`lrmeshq


9u
��>>Ј<0

�$0H`lrmeshq


9u
��>>Ј<0

�$0H`lrmeshq


9u
��>>Ј<0

�$0H`lrmeshq


9u
��Ԁ	8�--Ѐ<	0rmeshu

7��>>Ј<0

�$0H`lrmeshq


9u
c�Ԁ��<<Ѐ< 
�$0H`lq


9u
��ԀT�--Ѐ<@rmeshu
4��Ԁ[�--Ѐ<@rmeshu
7k�Ԁ7
>>Ѐ<0

�$0H`lrmeshq


9u

7
Ԁc7
<<Ѐ<P

�$0H`lq


9u
8
Ԁ2j
Ԁ�j
<<Ѐ<@

�$0H`lq


9u
�k
>>Ѐ<P

�$0H`lrmeshq


9u
�l
Ԁ��<<��������P-��

�$0H`lxrmesh��>>Ѐ<`

�$0H`lrmeshq


9u
Ɩ>>Ј<`

�$0H`lrmeshq


9u
×>>Ј<`

�$0H`lrmeshq


9u
��>>Ј<`

�$0H`lrmeshq


9u
ƙ>>Ј<`

�$0H`lrmeshq


9u
��>>Ј<`

�$0H`lrmeshq


9u
��>>Ј<`

�$0H`lrmeshq


9u
��>>Ѐ<	`

�$0H`lrmeshq


9u
��Ԁ	�5>>Ѐ<p

�$0H`lrmeshq


9u
�6>>Ј<p

�$0H`lrmeshq


9u
�7>>Ј<p

�$0H`lrmeshq


9u
_8>>Ј<p

�$0H`lrmeshq


9u
S9>>Ј<p

�$0H`lrmeshq


9u
k:>>Ј<p

�$0H`lrmeshq


9u
h;>>Ј<p

�$0H`lrmeshq


9u
A<--Ѐ<�rmeshu4�<Ԁ�J--Ѐ<	prmeshu9�KԀ	#bAA��������`�a�

�$0H`lx��
rmeshHgFF���������Hg�

�$0H`lx
+
b�
��
rmeshOh>>Ѐ<�

�$0H`lrmeshq


9u
_hԀ�h--Ѐ<�rmeshu4>iԀ�i--Ѐ<�rmeshu7�iԀ
j>>Ѐ<	�

�$0H`lrmeshq


9u

m	Ԁ	
J
+Ԁ	
�
+<<Ѐ<	�
�$0H`lq


9u
},AA���������Mn�

�$0H`lxJ�
rmesh
�,>>Ѐ<�

�$0H`lrmeshq


9u

H-Ԁ
�-<<Ѐ<�
�$0H`lq


9u
�-Ԁ
�.>>Ѐ<�

�$0H`lrmeshq


9u

�.Ԁ
/<<Ѐ<�
�$0H`lq


9u
�/Ԁ
(�FF���������h��

�$0H`lx
+
b�
n�
rmesh
�FF��������p��

�$0H`lx
+��

��
rmesh
��AA���������m��

�$0H`lxJ�
rmesh
+bFF�����������

�$0H`lx
+��

q�
rmesh
HgFF������������

�$0H`lx
+
��
��
rmesh
 
-

������
-


},AA��������p
���

�$0H`l8�
4mesh�,RRЀ<�J

�$0H`l4mesh3
������97d-Ԁ
-.PPЀ<�

J

�$0H`l3
������97
.Ԁ/RRЀ<�
J

�$0H`l4mesh3
������97/Ԁj/PPЀ<�
J

�$0H`l3
������97
+0Ԁ�FF���������E�

�$0H`l
-z�

3�
4mesh(�FF����������J�

�$0H`l
-
E�
��
4mesh��FF���������
�Q&�

�$0H`l
-�%�
K�
4mesh+bFF���������3�&�

�$0H`l
-K�

��
4meshHgFF�����������&�

�$0H`l
-
�&�
R&�
4mesh�
LL��������������

-��


+LL�������������

+
��


 
 

������
-


LL��������������
-��


+


5
+LL��������������
+
��


 
 

������
-


.LL��������������
-��


+


aLL��������������
+
��


 
 

������
-


`EEЀ������� D%

��

-�EEЀ������� D%
�,


-�EEЀ�������
 D%
��


-�	??Ѐ<�
 E��

-�	Ԁ,
-??Ѐ<
 E�)
-�
-Ԁc??Ѐ<� E��
-Ԁ�LL�<
-���

+


�
EEЀ�������

�%

��

+�
EEЀ������


�%
�3


+EEЀ������ 


�%
��


+sԀ	�??Ј<0


��-

+�ԀA??Ѐ<


���

+�Ԁx??Ѐ<�

���
+4Ԁ�LL�<
+���

 



 
-

�Ԁ1LL�<
-
��

+

�ԀFLL�<
+ 
��

 



 
-

�Ԁ�LL�<	
-�
��

+

Ԁ�LL�<	
+@
��

 



 
-

�Ԁ	�``�<�

+

3Ԁ	�``�<P

 ��E0@
 


-


�
	�Ԁ
-``�< 

+


�
	Ԁ]``�<0

 ��E0@
 


-


�
	�Ԁ�``�<�
+


�
	2 Ԁ� ``�<�
 ��E0@
 


-


�
	�Ԁ	d``�<
+


�
	�5LL��������������
��


+


������
+

�5LL�������������@

��


+


������
+

7LL�������������`

��


+


������
+

�9Ԁ	/:LL�<p

+��

+
+


+


?:Ԁ�:LL�<P

+��

+
+


+


<LL�<P

+��

+
+


+


<=Ԁ�=LL�<�
+��

+
+


+


#?Ԁ�?``�<
+
��E0@
+



+

	�
@Ԁ_@``�<
+`
��E0@
+



+

	�
4AԀ�FF��������
E�

�$0H`lx
+��

�
rmesh(�FF��������p
�r�

�$0H`lx
+
E�
��
rmesh��FF���������
�	&�

�$0H`lx
+��
s�
rmesh��Ԁ	��``�<�

 ��E0
@
 


-


�
	tԀ�``�<0

+


�
	ǣԀ�``�<�

 ��E0
@
 


-


�
	�Ԁc``�<�
+


�
	�Ԁ��``�< 

 ��E0
@
 


-


�
	�Ԁ	�``�<
+


�
	�Ԁ��``�<
+0
��E0
@
+



+

	�
�Ԁ[�``�<
+�
��E0
@
+



+

	�
n�``�<
+�
��E0
@
+



+

	�
#�``�<
+�
��E0
@
+



+

	�
��Ԁ+bFF��������@
3�&�

�$0H`lx
+s�

��
rmeshH�FF���������
�'�

�$0H`lx
+
�&�

+&�
rmesh}�Ԁ	��//Ѐ<�


�

+�ԀU�//Ѐ<�


�

+��Ԁd�//Ѐ<P


�

+�&FF���������
ͪ-�

�$0H`lx
+��
'�
rmesh�--Ѐ<	�
rmeshu4�Ԁ	d
+>>Ј<	�


�$0H`lrmeshq


9u
H�>>Ѐ<	

�$0H`lrmeshq


9u
K�Ԁ	�Ԁ	��<<Ѐ<	
�$0H`lq


9u	�FF��������`
S�.�

�$0H`lx
+'�

U'�
rmesh(�FF���������
�.�

�$0H`lx
+
�.�
�-�
rmesh�!??Ѐ<	 

� 
+��
�#EEЀ������0

�%
+�8

�#EEЀ�������


�%
+�
%EEЀ������p


�%
+��
�&Ԁ2+??Ј<�


�

+��B+Ԁ�+??Ѐ<�


�
+�-
9,Ԁ�,??Ѐ<	P

�
+��
�/``�<@
 ��E0@
 


-


�
	�Ԁ%``�<@

+


�
	�/Ԁ*0``�<�

 ��E0@
 


-


�
	�Ԁ�``�<

+


�
	�0Ԁ�1``�<�

 ��E0@
 


-


�
	V+LL�������������

��


-


������
-

�+LL�������������P

��


-


������
-

�,FF�������� ��-�

�$0H`l
-z-�
�&�
4mesh�FF�������� 
S�.�

�$0H`l
-�&�

u'�
4mesh(�FF��������`
�.�

�$0H`l
-
�.�
�-�
4meshS�Ԁ	�``�<0
+


�
	�2ԀM5``�<
+�
��E0@
+



+

	�
]5Ԁ�5``�<
+��E0@
+



+

	�
7``�<
+��E0@
+



+

	�
T8Ԁ9``�<	
+`��E0@
+



+

	�
��Ԁ	��``�<p
 ��E0@
 


-


�
	&�Ԁ}�``�<p

+


�
	ǣԀ�``�<
 ��E0@
 


-


�
	R�Ԁ�``�<0

+


�
	�Ԁ��``�<�

 ��E0@
 


-


�
	��FF��������@�5�

�$0H`l
-z-�
�.�
4mesh+bFF��������@
s(6�

�$0H`l
-�.�

/�
4meshHgFF���������
.6�

�$0H`l
-
(6�
�5�
4mesh@�22Ѐ<	PJ
4mesh7��Ԁ	2�RRЀ<	`J

�$0H`l4mesh3
������97;�Ԁ	��22Ѐ<	pJ
4mesh7266Ј<� F	
-&2Ԁt2,,Ѐ<�
 F

-3Ԁ{3,,Ѐ<P
 F

-�FF���������
	=�

�$0H`l
-.6�
�<�
4mesh�LL�������������`
��


-


������
-

�LL��������������
��


-


������
-

%LL����������������


-


������
-

�FF��������p
��=�

�$0H`l
-�.�

/�
4mesh��22Ѐ<�
J
4mesh7
��Ԁ�22Ѐ<�
J
4mesh7
��Ԁ(�FF���������
(�=�

�$0H`l
-
�=�
	=�
4meshK�RRЀ<�
J

�$0H`l4mesh3
������97[�Ԁ��22Ѐ<�
J
4mesh7B�Ԁ��22Ѐ<�
J
4mesh7��Ԁ�M
22Ѐ<�
J
4mesh7
�N
ԀeP
RRЀ<�
J

�$0H`l4mesh3
������97\Q
Ԁ�R
22Ј<�
J
4mesh7

66Ѐ<�
 F�
Ԁ�URRЀ<	�J

�$0H`l4mesh3
������97	XRRЈ<	�J

�$0H`l4mesh3
������97	YRRЈ<	�J

�$0H`l4mesh3
������97	ZRRЈ<	�J

�$0H`l4mesh3
������97	1[RRЈ<	�J

�$0H`l4mesh3
������97	��FF���������-�D�

�$0H`l
-�=�
^D�
4mesh��Ԁ	,�PPЀ<	�
J

�$0H`l3
������97
	��RRЀ<	�J

�$0H`l4mesh3
������97	��RRЈ<	�J

�$0H`l4mesh3
������97	��RRЈ<	�J

�$0H`l4mesh3
������97	�RRЈ<	�J

�$0H`l4mesh3
������97	�RRЈ<	�J

�$0H`l4mesh3
������97	�RRЈ<	�J

�$0H`l4mesh3
������97	�(Ԁ	C)22Ѐ<	�J
4mesh7	6<<���������
�>E�

�$0H`l4mesh=6RRЀ<�
J

�$0H`l4mesh3
������97%7RRЈ<�
J

�$0H`l4mesh3
������97P8RRЈ<�
J

�$0H`l4mesh3
������97`9RRЈ<�
J

�$0H`l4mesh3
������97�:RRЈ<�
J

�$0H`l4mesh3
������97�;RRЈ<�
J

�$0H`l4mesh3
������97�<RRЈ<�
J

�$0H`l4mesh3
������97HgFF��������HpE�

�$0H`l
-�D�
?E�
4meshkhRRЀ<�
J

�$0H`l4mesh3
������97{hԀ�hPPЀ<
J

�$0H`l3
������97
�iԀ��RRЀ<J

�$0H`l4mesh3
������97��Ԁ�RRЀ< J

�$0H`l4mesh3
������97�RRЈ< J

�$0H`l4mesh3
������97;�RRЈ< J

�$0H`l4mesh3
������97T�RRЈ< J

�$0H`l4mesh3
������97d�RRЈ< J

�$0H`l4mesh3
������97��RRЈ< J

�$0H`l4mesh3
������97��RRЈ< J

�$0H`l4mesh3
������97�		22Ѐ<J
4mesh7�		Ԁ
-	22Ѐ<0J
4mesh7�
-	22Ј<0J
4mesh7s	Ԁ�r	22Ѐ< J
4mesh7�s	Ԁ��RRЀ<	J

�$0H`l4mesh3
������97
-��Ԁ	��Ԁ	��PPЀ<	
J
	
�$0H`l3
������97

-
-�&FF�������� M/L�

�$0H`l
-�=�
	�K�
4mesh��<<��������0�M�

�$0H`l4mesh�RRЀ<@J

�$0H`l4mesh3
������97$�RRЈ<@J

�$0H`l4mesh3
������97�RRЈ<@J

�$0H`l4mesh3
������97)�RRЈ<@J

�$0H`l4mesh3
������97]�RRЈ<@J

�$0H`l4mesh3
������97I�FF��������PhM�

�$0H`l
-/L�
M�
4mesh�RRЈ<@J

�$0H`l4mesh3
������97��Ԁr�PPЀ<@
J

�$0H`l3
������97
��Ԁ��ԀZ�RRЀ<PJ

�$0H`l4mesh3
������97j�Ԁ��PPЀ<`
J

�$0H`l3
������97
y�Ԁ<�RRЀ<pJ

�$0H`l4mesh3
������97[�ԀHOFF��������p��T�

�$0H`l
-/L�
M�
4mesh+�FF�����������T�

�$0H`l
-�T�
�M�
4mesh�$22Ѐ<�J
4mesh7�%22Ј<�J
4mesh7�&22Ј<�J
4mesh7^'22Ј<�J
4mesh7K(22Ј<�J
4mesh78)22Ј<�J
4mesh77*22Ј<�J
4mesh7�LL����������������


-


������
-

�LL����������������


-


������
-

(�AA����������;\�

�$0H`l�T�
4mesh�FF���������v\�

�$0H`l
-<\�
DU�
4meshHOAA�����������c�

�$0H`lv\�
4mesh+�FF���������3d�

�$0H`l
-�c�
DU�
4mesh��22Ѐ<�J
4mesh7��Ԁ��RRЀ<�J

�$0H`l4mesh3
������97	|�Ԁ��22Ѐ<�J
4mesh7	��22Ј<�J
4mesh7	(�AA����������}k�

�$0H`ld�
4mesh�AA���������S�k�

�$0H`l~k�
4mesh��Ԁ��PPЀ<
J
	
�$0H`l3
������97

-��RRЀ<J

�$0H`l4mesh3
������97
-��ԀHOAA���������s�

�$0H`l�k�
4mesh+�FF�������� sYs�

�$0H`l
-s�
	l�
4mesh(�AA���������(�z�

�$0H`lYs�
4mesh�FF��������0��z�

�$0H`l
-�z�
	�s�
4meshHOAA���������Ha��

�$0H`l�z�
4mesh��Ԁ�22Ѐ<@J
4mesh7
-�22Ј<@J
4mesh7
-��FF��������P����

�$0H`l
-a��
	I{�
4mesh��Ԁ4�22Ѐ<`J
4mesh7
-+�Ԁ��RRЀ<pJ

�$0H`l4mesh3
������97|�Ԁ��22Ј<�J
4mesh7	(�AA��������h��

�$0H`l���
4mesh	�AA����������<��

�$0H`l��
4mesh	��Ԁ	x�PPЀ<�
J

�$0H`l3
������97
	��RRЀ<�J

�$0H`l4mesh3
������97	"�Ԁ	HOAA������������

�$0H`l=��
4mesh	+�FF����������ݑ�

�$0H`l
-���
@��
4mesh
\ No newline at end of file
+


�
	�Ԁ3�``�<
+�
��E0@
+



+

	�
C�Ԁ��``�<
+ ��E0@
+



+

	�
�FF����������o5�

�$0H`lx
+�.�
�-�
rmeshs�``�<
+ ��E0@
+



+

	�
H�Ԁ�``�<	
+���E0@
+



+

	�
+bFF���������
s(6�

�$0H`lx
+�.�

U'�
rmeshH�FF��������0V6�

�$0H`lx
+
(6�
p5�
rmesh��//Ѐ<�


�
�ԀQ�//Ѐ<@

�
��Ԁ%�--Ј<�
rmeshu
4�Ԁ9�Ԁ��EEЀ�������

�%
+�>

J�EEЀ������P

�%
+�
��EEЀ������

�%
+��
�>FF���������
=�

�$0H`lx
+V6�
�<�
rmesh�AA����������=�

�$0H`lxV6�
rmesh��ԀX�<<Ѐ< 
�$0H`lq


9uH�<<Ј< 
�$0H`lq


9u.�>>Ѐ<0

�$0H`lrmeshq


9u
1�Ԁ(�FF��������`(�=�

�$0H`lx
+
�=�
=�
rmesh��FF���������-�D�

�$0H`lx
+�=�
�D�
rmesh+bFF��������@�jE�

�$0H`lx
+�=�
`>�
rmeshH�FF��������pH�E�

�$0H`lx
+
kE�
�D�
rmesh��	EEЀ�������

�%
+�>


+�	EEЀ�������

�%
+�
B�	EEЀ������P

�%
+��

�	Ԁ��	??Ѐ<`

�

+����	Ԁ��	??Ѐ<�

�
+�T
��	Ԁ0�	??Ѐ<	�

�
+�+��	Ԁ	F�	``�<
+��E0@
+


+


�
	V�	Ԁ��	``�<�
+��E0@
+


+


�
	��	Ԁ��	``�<p
+��E0@
+


+


�
	��	``�<
+��E0@
+


+


�
	��	Ԁ�	``�<�
+��E0@
+


+


�
	��	ԀF�	``�<
+���E0@
+



+

	�
V�	Ԁ��	``�<
+���E0@
+



+

	�
��	Ԁ�	``�<�
+��E0@
+


+


�
	��	Ԁ��	``�<
+���E0@
+



+

	�
��	Ԁ�	``�<
+���E0@
+



+

	�
��	Ԁ��	``�<	
+0��E0@
+



+

	�
�>FF��������@MGL�

�$0H`lx
+�E�
'L�
rmesh�FF����������M�

�$0H`lx
+�E�

F�
rmesh(�FF���������h9M�

�$0H`lx
+
M�
GL�
rmesh|`Ԁ�`--Ѐ<�rmeshu7+bFF����������T�

�$0H`lx
+9M�
�M�
rmesh�cԀ`d--Ѐ<�rmeshu4aeԀH�FF�����������T�

�$0H`lx
+
�T�
GL�
rmeshX�Ԁ��--Ѐ<rmeshu7s�	//Ѐ<

�
��	Ԁъ	//Ѐ<

�
̋	//Ј<

�
Ќ	//Ј<

�
��	//Ј<

�
��	//Ј<

�
p�	//Ј<

�
P�	//Ј<

�
�<<<Ѐ<

�
+*=ԀL=--Ѐ< rmeshu4:>--Ј< rmeshu4�>--Ј< rmeshu4�?--Ј< rmeshu4�@--Ј< rmeshu4�A--Ј< rmeshu4O--Ј< rmeshu4�AA�������� N\�

�$0H`lx9M�
rmesh��ԀX�<<Ѐ<0
�$0H`lq


9u5�>>Ѐ<@

�$0H`lrmeshq


9u
8�Ԁ��--Ѐ<Prmeshu
4��Ԁ�--Ѐ<0rmeshu
7��Ԁ(�AA��������@�{\�

�$0H`lx
N\�
rmesh#bAA��������`3�c�

�$0H`lx�\�
rmeshEb>>Ѐ<P

�$0H`lrmeshq


9u
�bԀxc<<Ѐ<p
�$0H`lq


9u�cԀ^d>>Ѐ<�

�$0H`lrmeshq


9u
ndԀ�d<<Ѐ<`
�$0H`lq


9u~e<<Ј<`
�$0H`lq


9u#fԀH�AA��������p�Ld�

�$0H`lx�c�
rmeshT�Ԁʿ--Ѐ<�rmeshu7�FF���������S�k�

�$0H`lx
+d�
Md�
rmesh(
AA�����������k�

�$0H`lx�k�
rmesh#bAA���������s1s�

�$0H`lx�k�
rmesh�cԀkd<<Ѐ<�
�$0H`lq


9u!f>>Ј<�

�$0H`lrmeshq


9u
$gԀH�AA����������s�

�$0H`lx1s�
rmesh�FF�����������z�

�$0H`lx
+�k�
ds�
rmesh�
--Ѐ<�rmeshu4�
Ԁ
--Ѐ<�rmeshu7�
Ԁ(
AA���������(0{�

�$0H`lx�z�
rmesh'
>>Ѐ<

�$0H`lrmeshq


9u
7
Ԁ�
--Ѐ<�rmeshu4 
Ԁ� 
--Ѐ<rmeshu7� 
Ԁ#bAA�������� �s��

�$0H`lx{�
rmeshEb>>Ѐ<�

�$0H`lrmeshq


9u
�bԀxc<<Ѐ<0
�$0H`lq


9u	�cԀ0d>>Ѐ<@

�$0H`lrmeshq


9u
	@dԀ�d<<Ѐ<�
�$0H`lq


9u	3eԀH�AA���������H���

�$0H`lxt��
rmesh	�FF��������P���

�$0H`lx
+���
���
rmesh	(
AA��������hV��

�$0H`lx��
rmesh	+bFF��������`��

�$0H`lx
+_��
V��
rmesh	H�AA������������

�$0H`lx���
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-3-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-3-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-3-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-3-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,153 +1,267 @@
-��i
$<<��������
$�

�$0H`l4mesh %RRЀ<J

�$0H`l4mesh3
������97
0%Ԁ~%PPЀ<
J

�$0H`l3
������97


?&Ԁs&RRЀ< J

�$0H`l4mesh3
������97
8'Ԁ�(PPЈ<
J

�$0H`l3
������97


)Ԁ�?<<��������		k?�

�$0H`l4mesh�?RRЀ<	0J

�$0H`l4mesh3
������97*ARRЈ<	0J

�$0H`l4mesh3
������97UBRRЈ<	0J

�$0H`l4mesh3
������97JCRRЈ<	0J

�$0H`l4mesh3
������97~DRRЈ<	0J

�$0H`l4mesh3
������97�ERRЈ<	0J

�$0H`l4mesh3
������97�FRRЈ<	0J

�$0H`l4mesh3
������97��AA�������� (��

�$0H`l$�
4mesh�Ԁ%�PPЀ<0
J


�$0H`l3
������97

�RRЀ<@J

�$0H`l4mesh3
������97=�Ԁ��RRЀ<
-		J

�$0H`l4mesh3
������97
��RRЈ<
-		J

�$0H`l4mesh3
������97
��Ԁ
-��RRЀ<	@J

�$0H`l4mesh3
������97��RRЈ<	@J

�$0H`l4mesh3
������97�RRЈ<	@J

�$0H`l4mesh3
������97(�RRЈ<	@J

�$0H`l4mesh3
������97A�RRЈ<	@J

�$0H`l4mesh3
������97H�RRЈ<	@J

�$0H`l4mesh3
������97j�RRЈ<	@J

�$0H`l4mesh3
������97q�22Ѐ<	PJ
4mesh7
-�Ԁk
22Ѐ<
-		 J
4mesh7

�k
Ԁ
-��<<��������		0���

�$0H`l4mesh�RRЀ<	`J

�$0H`l4mesh3
������97J�RRЈ<	`J

�$0H`l4mesh3
������97c�RRЈ<	`J

�$0H`l4mesh3
������97a�RRЈ<	`J

�$0H`l4mesh3
������97_�RRЈ<	`J

�$0H`l4mesh3
������97x�RRЈ<	`J

�$0H`l4mesh3
������97v�RRЈ<	`J

�$0H`l4mesh3
������97-�FF��������p-��

�$0H`l
-��
��
4meshP�RRЀ<		@J

�$0H`l4mesh3
������97`�Ԁ	��PPЀ<	�
J

�$0H`l3
������97
o�Ԁ�7FF��������PH7�

�$0H`l
-��

��
4mesh�HRRЀ<	�J

�$0H`l4mesh3
������97�IRRЈ<	�J

�$0H`l4mesh3
������97KRRЈ<	�J

�$0H`l4mesh3
������97-LRRЈ<	�J

�$0H`l4mesh3
������97OMRRЈ<	�J

�$0H`l4mesh3
������97_NRRЈ<	�J

�$0H`l4mesh3
������97�ORRЈ<	�J

�$0H`l4mesh3
������973QԀ
-�g22Ѐ<		PJ
4mesh7�gԀ	�g22Ѐ<	�J
4mesh7�hԀčRRЀ<
-		`J

�$0H`l4mesh3
������97��Ԁ
-K�22Ѐ<
-		pJ
4mesh7<<��������		���

�$0H`l4mesh6RRЀ<	�J

�$0H`l4mesh3
������97ORRЈ<	�J

�$0H`l4mesh3
������97h RRЈ<	�J

�$0H`l4mesh3
������97�!RRЈ<	�J

�$0H`l4mesh3
������97"RRЈ<	�J

�$0H`l4mesh3
������97�#RRЈ<	�J

�$0H`l4mesh3
������97�$RRЈ<	�J

�$0H`l4mesh3
������97M6FF���������M6�

�$0H`l
-7�
�
4meshp7RRЀ<		�J

�$0H`l4mesh3
������97�7Ԁ	�7PPЀ<	�
J

�$0H`l3
������97
�8Ԁ
�{RRЀ<	�J

�$0H`l4mesh3
������97
�|RRЈ<	�J

�$0H`l4mesh3
������97
�}RRЈ<	�J

�$0H`l4mesh3
������97
RRЈ<	�J

�$0H`l4mesh3
������97
8�RRЈ<	�J

�$0H`l4mesh3
������97
-�RRЈ<	�J

�$0H`l4mesh3
������97
=�RRЈ<	�J

�$0H`l4mesh3
������97
��Ԁ
-
J�22Ј<		�J
4mesh7
Z�Ԁ	
��22Ѐ<	�J
4mesh7
A�Ԁ
��RRЀ<
-		�J

�$0H`l4mesh3
������97
��Ԁ
-
"�22Ѐ<
-		�J
4mesh7
�T<<��������		�˖�

�$0H`l4mesh
URRЀ<	
J

�$0H`l4mesh3
������97
�UԀ
�VPPЀ<		�
J

�$0H`l3
������97

�VԀ	
zWRRЀ<		�J

�$0H`l4mesh3
������97
�WԀ	
�WPPЀ<	

J

�$0H`l3
������97

�XԀ
-�FF�������� 
m�

�$0H`l
-7�
��
4mesh
�522Ѐ<0
J
4mesh7


�622Ѐ<pJ
4mesh7


�6Ԁ
"722Ј<0
J
4mesh7


�7Ԁ
L8FF����������y�

�$0H`l
-�

�
4mesh
n8RRЀ<@
J

�$0H`l4mesh3
������97
39Ԁ
�922Ѐ<�J
4mesh7

�9Ԁ
:22Ѐ<P
J
4mesh7

�:Ԁ
�AA��������		
�7�

�$0H`l�
4mesh
�Ԁ
-
��PPЀ<
-		

J

�$0H`l3
������97

��RRЀ<
-		 
J

�$0H`l4mesh3
������97
��Ԁ
-�LL�������	������0

+��i
$<<��������
$�

�$0H`lxrmesh�?AA��������		k?�

�$0H`lx$�
rmesh�?>>Ѐ<	

�$0H`lrmeshq


9u

A>>Ј<	

�$0H`lrmeshq


9u

�A>>Ј<	

�$0H`lrmeshq


9u

�B>>Ј<	

�$0H`lrmeshq


9u


D>>Ј<	

�$0H`lrmeshq


9u

�D>>Ј<	

�$0H`lrmeshq


9u

�E>>Ј<	

�$0H`lrmeshq


9u

��AA��������(��

�$0H`lx$�
rmesh��>>Ѐ< 

�$0H`lrmeshq


9u
ɗ>>Ј< 

�$0H`lrmeshq


9u
��>>Ј< 

�$0H`lrmeshq


9u
��>>Ј< 

�$0H`lrmeshq


9u
��>>Ј< 

�$0H`lrmeshq


9u
��>>Ј< 

�$0H`lrmeshq


9u
��>>Ј< 

�$0H`lrmeshq


9u
��--Ј<		@rmeshu
4��Ԁ	��--Ѐ<	0rmeshu

7u�Ԁ'�>>Ј<0

�$0H`lrmeshq


9u
*�Ԁ��--Ѐ<@rmeshu
4��Ԁ�--Ѐ<@rmeshu
7��Ԁ��Ԁ
+�<<Ѐ<
+		P

�$0H`lq


9u
A7
Ԁ�7
<<Ѐ<P

�$0H`lq


9u
-�<<��������P-��

�$0H`lxrmesh�FF��������		p���

�$0H`lx
+
��
��
rmesh&�>>Ѐ<	`

�$0H`lrmeshq


9u
ϩԀY�<<Ѐ<		�
�$0H`lq


9ui�Ԁ	�<--Ѐ<�rmeshu4�<ԀYJ--Ѐ<	prmeshu9�JԀ`K--Ѐ<		�rmeshu7pKԀ	�gFF���������Hg�

�$0H`lx
+
b�
��
rmesh�g>>Ѐ<�

�$0H`lrmeshq


9u
�hԀ
i--Ѐ<�rmeshu4iԀqi--Ѐ<�rmeshu7jԀ
�AA��������		��I�

�$0H`lx
��
rmesh
�>>Ѐ<	�

�$0H`lrmeshq


9u

�Ԁ
1	<<Ѐ<		�
�$0H`lq


9u
A	Ԁ	

+>>Ѐ<		�

�$0H`lrmeshq


9u


+Ԁ	
l
+<<Ѐ<	�
�$0H`lq


9u
Ԁ

,AA���������Mn�

�$0H`lxJ�
rmesh
->>Ѐ<�

�$0H`lrmeshq


9u

-Ԁ
j-<<Ѐ<�
�$0H`lq


9u
.Ԁ
1.>>Ѐ<�

�$0H`lrmeshq


9u

�.Ԁ
/<<Ѐ<�
�$0H`lq


9u
�/Ԁ
}�--Ѐ<
+		�rmeshu
4
l�Ԁ
+
��>>Ѐ<
+		�

�$0H`lrmeshq


9u

w�Ԁ
+
��--Ѐ<
+		
rmeshu
7
-�AA���������m��

�$0H`lxJ�
rmesh
��AA��������		
���

�$0H`lx��
rmesh
ǩԀ
+
.�>>Ѐ<
+		0


�$0H`lrmeshq


9u

1�Ԁ
+
M&AA��������
�h�

�$0H`lx��
rmesh�FF��������		@
��

�$0H`lx
+h�
��
rmesh_	LL�������	������P

 
��


 
 

������
-


'	LL�������������`

+


�	LL�������������

 
��


 
 

������
-



,AA��������p
���

�$0H`l8�
4mesh(-RRЀ<�J

�$0H`l4mesh3
������978-Ԁ�-PPЀ<�

J

�$0H`l3
������97
G.Ԁ�.RRЀ<�
J

�$0H`l4mesh3
������97I/Ԁ�/PPЀ<�
J

�$0H`l3
������97
�/Ԁ��FF����������J�

�$0H`l
-
E�
��
4meshUFF��������		@
�%�

�$0H`l
-��
��
4mesh-�FF���������
�Q&�

�$0H`l
-�%�
K�
4mesh�gFF�����������&�

�$0H`l
-
�&�
R&�
4mesh$�FF��������		P
+z-�

�$0H`l
-R&�
!'�
4mesh,
LL�������	������`

-��


+


�
+LL��������������
+
��


 
 

������
-


W
LL��������������

-��


-
-

������
-


�LL��������������
-��


+


WEEЀ������


�%
�3


+�EEЀ������ 


�%
��


+�EEЀ������		`


�%
��

+�Ԁ
+7??Ѐ<		p


�
��
+GԀ	�??Ѐ<0


��-

+w??Ј<0


��-

+ Ԁ�??Ѐ<


���

+Ԁ�LL�<
+ 
��

+



 
-

������
-


$EEЀ������� D%
�,


-sEEЀ�������
 D%
��


-�EEЀ������		p
 D%
��

-vԀ
-	??Ѐ<		�
 E
��
-	Ԁ	b	??Ѐ<�
 E��

-
-Ԁ�
-??Ѐ<
 E�)
-Ԁ�LL�<
-
��

+

�Ԁ.LL�<	
+@
��

 



 
-

�ԀLL�<	
-�
��

+

�Ԁ�LL�<
+	
+�
��

 



 
-

�Ԁ�LL�<
+

�LL�<
 	
-�
��

+�
��

 



 
-

�Ԁ
-�``�<	�

+

Ԁ
+�``�<	�

 ��E0@
 


-


�
	�Ԁ	``�<�

+


�
	Ԁ	^``�<P

 ��E0@
 


-


�
	�Ԁ�``�< 

+


�
	3Ԁ�``�<0

 ��E0@
 


-


�
	�Ԁ
-e``�<	�

+


�
	U6LL�������������@

��


+


������
+

�6LL�������������`

��


+


������
+

�7LL�������	�������

��


+


������
+

�8Ԁ
+H9LL�<	�

+��

+
+


+


X9Ԁ	�9LL�<p

+��

+
+


+


l:Ԁ;LL�<P

+��

+
+


+


=LL�<P

+��

+
+


+


5@Ԁ�@``�<
+`
��E0@
+



+

	�
AԀ_A``�<	
+�
��E0@
+



+

	�
�B``�<	
+�
��E0@
+



+

	�
�CԀDD``�<
+	
+�
��E0@
+



+

	�
�KԀ
+��FF��������p
�r�

�$0H`lx
+
E�
��
rmesh-�FF���������
�	&�

�$0H`lx
+��
s�
rmesh��Ԁ
+��``�<	�

 ��E0
@
 


-


�
	uԀ	�``�<
+


�
	ȢԀ	�``�<�

 ��E0
@
 


-


�
	�Ԁ�Ԁ
-�``�<	�

+


�
	��Ԁ��``�<�

+��E0
@
+


+


�
	1�Ԁ��``�<
+�
��E0
@
+



+

	�
̭Ԁ#�``�<	
+�
��E0
@
+



+

	�
��Ԁ.�--Ѐ<
+		rmeshu4�Ԁ
+��>>Ѐ<
+		

�$0H`lrmeshq


9u
��Ԁ
+
�--Ѐ<
+		 rmeshu7��FF���������
�'�

�$0H`lx
+
�&�

+&�
rmeshA�//Ѐ<		0

�

+Q�Ԁ	��//Ѐ<�


�

+4�Ԁ��//Ѐ<�


�

+M&FF���������
ͪ-�

�$0H`lx
+��
'�
rmesh�--Ѐ<	�
rmeshu45Ԁ�--Ѐ<		@rmeshu7�Ԁ	�AA��������		P+�-�

�$0H`lx�-�
rmesh�>>Ѐ<	�


�$0H`lrmeshq


9u
	>>Ј<	�


�$0H`lrmeshq


9u
�	>>Ј<	�


�$0H`lrmeshq


9u
>>Ј<	�


�$0H`lrmeshq


9u
�>>Ј<	�


�$0H`lrmeshq


9u
�>>Ј<	�


�$0H`lrmeshq


9u
�
>>Ј<	�


�$0H`lrmeshq


9u
�<<Ѐ<
+		`
�$0H`lq


9u�>>Ѐ<
+		p

�$0H`lrmeshq


9u
�>>Ј<
+		p

�$0H`lrmeshq


9u
�Ԁ
+ܧ>>Ѐ<	

�$0H`lrmeshq


9u
��Ԁ�<<Ѐ<		�
�$0H`lq


9u	�Ԁ	ߪ>>Ј<		�

�$0H`lrmeshq


9u
	�Ԁ	=�<<Ѐ<	
�$0H`lq


9u	�Ԁ��FF���������
�.�

�$0H`lx
+
�.�
�-�
rmesh�
<<Ѐ<
+		�

�8!EEЀ������		�

�%

+��
Z!??Ѐ<	 

� 
+��
"Ԁ�"??Ѐ<
+		�

�

+�f#EEЀ������0

�%
+�8

T$EEЀ�������


�%
+�
(``�<	�
 ��E0@
 


-


�
	�Ԁ	&``�<
+


�
	-(Ԁ	�(``�<@
+��E0@
+


+


�
	�)``�<@
 ��E0@
 


-


�
	�Ԁ�``�<@

+


�
	o+Ԁ�+??Ѐ<�


�
+�-

,Ԁ[,??Ѐ<	P

�
+��
-Ԁ�-??Ѐ<
+		�

�
+�+/``�<@
+��E0@
+


+


�
	0Ԁ�0``�<�

 ��E0@
 


-


�
	W,FF�������� ��-�

�$0H`l
-z-�
�&�
4mesh��FF��������`
�.�

�$0H`l
-
�.�
�-�
4meshT�Ԁ
-�``�<	�

+


�
	�5Ԁ�6Ԁ
+8``�<
+��E0@
+



+

	�
(8Ԁ8``�<	
+`��E0@
+



+

	�
T9Ԁ:``�<
+	
+���E0@
+



+

	�
<``�<
+	
+���E0@
+



+

	�
��Ԁ
+��``�<	
 ��E0@
 


-


�
	'�Ԁ	~�``�<0
+


�
	ȢԀ	�``�<p
 ��E0@
 


-


�
	S�Ԁ�``�<p

+


�
	��Ԁ��``�<
 ��E0@
 


-


�
	-�FF��������@�5�

�$0H`l
-z-�
�.�
4mesh�gFF���������
.6�

�$0H`l
-
(6�
�5�
4mesh��22Ѐ<	PJ
4mesh7}�Ԁ��66Ѐ<
-		�
 F��22Ѐ<		J
4mesh7��Ԁ	��FF��������		k�<�

�$0H`l
-�5�
c6�
4mesh��RRЀ<	`J

�$0H`l4mesh3
������97o�Ԁ��22Ѐ<		 J
4mesh7�Ԁ	]�22Ѐ<	pJ
4mesh7��Ԁ166Ѐ<� F	
-�166Ј<� F	
-R2Ԁ�2,,Ѐ<�
 F

-
FF���������
	=�

�$0H`l
-.6�
�<�
4meshzLL��������������
��


-


������
-

�LL����������������


-


������
-

��Ԁw�22Ѐ<�
J
4mesh7
��FF���������
(�=�

�$0H`l
-
�=�
	=�
4mesh��Ԁ��Ԁ}
66Ѐ<�
 F�
Ԁ8!EEЀ������		0 D%

-�h
]SԀ
-�S22Ѐ<
-		@J
4mesh7�T22Ј<
-		@J
4mesh7RUAA��������		P�]D�

�$0H`l>�
4meshtURRЀ<	�J

�$0H`l4mesh3
������97	�VRRЈ<	�J

�$0H`l4mesh3
������97	�WRRЈ<	�J

�$0H`l4mesh3
������97	�XRRЈ<	�J

�$0H`l4mesh3
������97	~YRRЈ<	�J

�$0H`l4mesh3
������97	�ZRRЈ<	�J

�$0H`l4mesh3
������97	�[RRЈ<	�J

�$0H`l4mesh3
������97	-�FF���������-�D�

�$0H`l
-�=�
^D�
4meshJ�RRЈ<		`J

�$0H`l4mesh3
������97Z�Ԁ	��PPЀ<	�
J

�$0H`l3
������97
	i�ԀR�RRЀ<	�J

�$0H`l4mesh3
������97	P�RRЈ<	�J

�$0H`l4mesh3
������97	N�RRЈ<	�J

�$0H`l4mesh3
������97	g�RRЈ<	�J

�$0H`l4mesh3
������97	��RRЈ<	�J

�$0H`l4mesh3
������97	��RRЈ<	�J

�$0H`l4mesh3
������97	��RRЈ<	�J

�$0H`l4mesh3
������97	I�Ԁ
-�(22Ѐ<		pJ
4mesh7	�(Ԁ	�(22Ѐ<	�J
4mesh7	�)Ԁ�7RRЈ<�
J

�$0H`l4mesh3
������97�9RRЈ<�
J

�$0H`l4mesh3
������97;RRЈ<�
J

�$0H`l4mesh3
������97-<RRЈ<�
J

�$0H`l4mesh3
������97a=RRЈ<�
J

�$0H`l4mesh3
������97�eRRЀ<
-		�J

�$0H`l4mesh3
������97	�fԀ
-�hԀMiPPЀ<
J

�$0H`l3
������97
��RRЀ< J

�$0H`l4mesh3
������97��RRЈ< J

�$0H`l4mesh3
������97��RRЈ< J

�$0H`l4mesh3
������97�RRЈ< J

�$0H`l4mesh3
������97
�RRЈ< J

�$0H`l4mesh3
������97�		Ԁd
-	22Ѐ<0J
4mesh7�<<��������		���K�

�$0H`l4mesh6�RRЀ<	J

�$0H`l4mesh3
������97
-��Ԁ��PPЀ<		�
J
	
�$0H`l3
������97

-
-��Ԁ	��RRЀ<		�J

�$0H`l4mesh3
������97
-��Ԁ	
�PPЀ<	
J
	
�$0H`l3
������97

-
-��ԀM&FF�������� M/L�

�$0H`l
-�=�
	�K�
4mesh`�22Ѐ<0J
4mesh7D�22Ј<0J
4mesh7C�22Ј<0J
4mesh7�22Ј<0J
4mesh7�22Ј<0J
4mesh7��22Ј<0J
4mesh7��22Ј<0J
4mesh7-�AA��������@m�S�

�$0H`l	�K�
4mesh��22Ѐ<	PJ
4mesh7
-
-��22Ј<	PJ
4mesh7
-
-��22Ј<	PJ
4mesh7
-
-��22Ј<	PJ
4mesh7
-
-v�22Ј<	PJ
4mesh7
-
-Q�22Ј<	PJ
4mesh7
-
-Y�22Ј<	PJ
4mesh7
-
-M>AA��������`��[�

�$0H`l	�K�
4mesh-i<<��������p��b�

�$0H`l4meshM><<�����������j�

�$0H`l4mesh-�<<����������Tr�

�$0H`l4meshM"<<���������
�y�

�$0H`l4mesh-�<<���������-���

�$0H`l4meshM*<<���������M<��

�$0H`l4mesh	-q<<���������m�

�$0H`l4mesh
\ No newline at end of file
+


�
	p�Ԁ��FF����������o5�

�$0H`lx
+�.�
�-�
rmesh�``�<
+ ��E0@
+



+

	�
�Ԁs�``�<	
+���E0@
+



+

	�
H�Ԁ�``�<
+	
+ ��E0@
+



+

	�
��FF��������0V6�

�$0H`lx
+
(6�
p5�
rmesh0�Ԁ��//Ѐ<@

�
��Ԁ�//Ѐ<	�

�
��Ԁ�//Ѐ<
+		0

�
��//Ј<
+		0

�
��//Ј<
+		0

�
8�EEЀ������		@

�%

+��
��EEЀ�������

�%
+�>

$FF��������		Pk�<�

�$0H`lx
+W6�
p5�
rmeshM>FF���������
=�

�$0H`lx
+V6�
�<�
rmesh��FF��������`(�=�

�$0H`lx
+
�=�
=�
rmesh}FF��������		`��D�

�$0H`lx
+�=�
=�
rmesh-�FF���������-�D�

�$0H`lx
+�=�
�D�
rmesh��FF��������pH�E�

�$0H`lx
+
kE�
�D�
rmesh��	EEЀ������		p

�%

+��
G�	EEЀ�������

�%
+�>

�	EEЀ�������

�%
+�
��	Ԁf�	??Ѐ<�

�
+�T
v�	Ԁ��	??Ѐ<	�

�
+�+m�	Ԁ��	??Ѐ<
+		�

�
+��7�	Ԁ
+G�	``�<	�
+��E0@
+


+


�
	W�	Ԁ	��	``�<
+��E0@
+


+


�
	��	ԀF�	``�<�
+��E0@
+


+


�
	��	Ԁ
+��	``�<	�
+��E0@
+


+


�
	��	Ԁ	��	``�<
+��E0@
+


+


�
	V�	``�<
+��E0@
+


+


�
	��	``�<
+��E0@
+


+


�
	
�	``�<
+��E0@
+


+


�
	��	Ԁ��	ԀF�	``�<
+���E0@
+



+

	�
V�	Ԁ��	``�<	
+ ��E0@
+



+

	�
��	ԀE�	``�<
+	
+���E0@
+



+

	�
��	``�<
+	
+���E0@
+



+

	�
��	Ԁ��	``�<
+���E0@
+



+

	�
��	Ԁ�	``�<	
+0��E0@
+



+

	�
��	Ԁ$FF��������		��&L�

�$0H`lx
+�E�
�D�
rmeshM>FF��������@MGL�

�$0H`lx
+�E�
'L�
rmesh-�FF��������Pm�S�

�$0H`lx
+�E�
'L�
rmesh��--Ѐ<`rmeshu4A�--Ј<`rmeshu48�--Ј<`rmeshu4/�--Ј<`rmeshu4�--Ј<`rmeshu4Ց--Ј<`rmeshu4��--Ј<`rmeshu4{�<<Ѐ<	p

�s�<<Ј<	p

�Q�<<Ј<	p

�A�<<Ј<	p

�C�<<Ј<	p

�!�<<Ј<	p

��<<Ј<	p

��--Ѐ<	�rmeshu	4�--Ј<	�rmeshu	4�--Ј<	�rmeshu	4�--Ј<	�rmeshu	4x--Ј<	�rmeshu	4K --Ј<	�rmeshu	4!--Ј<	�rmeshu	4M>AA�����������[�

�$0H`lx'L�
rmesh-i<<�����������b�

�$0H`lxrmeshM><<�����������j�

�$0H`lxrmesh-�<<����������Tr�

�$0H`lxrmeshM"<<���������
�y�

�$0H`lxrmesh-�<<���������-���

�$0H`lxrmeshM*<<���������M<��

�$0H`lxrmesh	-q<<��������m�

�$0H`lxrmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-4-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-4-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-4-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-4-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,260 +1,439 @@
-�ò���i\%Ԁ&PPЀ<
J

�$0H`l3
������97


�&RRЀ< J

�$0H`l4mesh3
������97
/)Ԁk?<<��������		k?�

�$0H`l4mesh��AA��������
+��iu$<<��������
$�

�$0H`lxrmesh�$>>Ѐ<		

�$0H`lrmeshq


9u

�%>>Ј<		

�$0H`lrmeshq


9u

�&>>Ј<		

�$0H`lrmeshq


9u

�'>>Ј<		

�$0H`lrmeshq


9u

�(>>Ј<		

�$0H`lrmeshq


9u

�)>>Ј<		

�$0H`lrmeshq


9u

�*>>Ј<		

�$0H`lrmeshq


9u

k?AA��������		k?�

�$0H`lx$�
rmesh'�>>Ѐ< 

�$0H`lrmeshq


9u
�>>Ј< 

�$0H`lrmeshq


9u
�>>Ј< 

�$0H`lrmeshq


9u
�>>Ј< 

�$0H`lrmeshq


9u
�>>Ј< 

�$0H`lrmeshq


9u
�>>Ј< 

�$0H`lrmeshq


9u
u�>>Ѐ<		 

�$0H`lrmeshq


9u

r�>>Ј<		 

�$0H`lrmeshq


9u

]�>>Ј<		 

�$0H`lrmeshq


9u

6�>>Ј<		 

�$0H`lrmeshq


9u

h�AA��������
 
-���

�$0H`l?�
4mesh�RRЀ<
-		J

�$0H`l4mesh3
������97
=�RRЈ<
-		J

�$0H`l4mesh3
������97
�Ԁ	��PPЀ<	
-
- 
J

�$0H`l3
������97


��Ԁ
-��22Ѐ<	PJ
4mesh7��Ԁ�j
22Ѐ<
-		 J
4mesh7

Ak
Ԁ	�k
22Ѐ<	
-
-@J
4mesh7

�k
Ԁ
-��<<��������		0���

�$0H`l4mesh��FF��������p-��

�$0H`l
-��
��
4mesh��RRЀ<		@J

�$0H`l4mesh3
������97��Ԁ	2�PPЀ<	�
J

�$0H`l3
������97
B�Ԁ�P22Ѐ<	
-
-pJ
4mesh7QԀ
-2g22Ѐ<		PJ
4mesh7�gԀ	Ih22Ѐ<	�J
4mesh7YhԀ�AA��������
-
-����

�$0H`l
��
4mesh;�RRЀ<
-		`J

�$0H`l4mesh3
������97�Ԁ	~�22Ѐ<	
-
-�J
4mesh7��Ԁ
-�22Ѐ<
-		pJ
4mesh7��Ԁ	�<<��������		���

�$0H`l4mesh�6FF���������M6�

�$0H`l
-7�
�
4mesh�6RRЀ<		�J

�$0H`l4mesh3
������97�7Ԁ	R8PPЀ<	�
J

�$0H`l3
������97
b8Ԁ
O�22Ѐ<	
-
-�J
4mesh7
_�Ԁ
-
�22Ѐ<		�J
4mesh7
�22Ј<		�J
4mesh7
��Ԁ	
�22Ѐ<	�J
4mesh7
�Ԁ
��AA��������
-
-��1�

�$0H`l�
4mesh
�RRЀ<
-		�J

�$0H`l4mesh3
������97
��Ԁ	
^�22Ѐ<	
-
-�J
4mesh7
n�Ԁ
-
��22Ѐ<
-		�J
4mesh7
^�Ԁ	
�T<<��������		�˖�

�$0H`l4mesh
�URRЀ<	
J

�$0H`l4mesh3
������97
�UԀ
�UPPЀ<		�
J

�$0H`l3
������97

�VԀ	
�VRRЀ<		�J

�$0H`l4mesh3
������97
�WԀ	
\XPPЀ<	

J

�$0H`l3
������97

lXԀ
��FF�������� 
m�

�$0H`l
-7�
��
4mesh
�522Ѐ<0
J
4mesh7


�6Ԁ
722Ј<0
J
4mesh7


�8RRЀ<@
J

�$0H`l4mesh3
������97
�9Ԁ
u:22Ѐ<P
J
4mesh7

��AA��������		
�7�

�$0H`l�
4mesh
��RRЀ<	
-
-
J

�$0H`l4mesh3
������97
��Ԁ
-
$�PPЀ<
-		

J

�$0H`l3
������97

��Ԁ	
�RRЀ<
-		 
J

�$0H`l4mesh3
������97
��Ԁ	
��PPЀ<	
-
-

J

�$0H`l3
������97

��Ԁ
-PLL�������
-������ 

+���

�$0H`lx?�
rmesh��>>Ј<		 

�$0H`lrmeshq


9u

u�>>Ј<		 

�$0H`lrmeshq


9u

{�>>Ј<		 

�$0H`lrmeshq


9u

T�>>Ѐ<
+		0

�$0H`lrmeshq


9u
��Ԁ	��<<Ѐ<	
+
+ 
�$0H`lq


9u
��Ԁ
+��--Ѐ<		@rmeshu
4��--Ј<		@rmeshu
4��--Ј<		@rmeshu
4��--Ј<		@rmeshu
4p�--Ј<		@rmeshu
41�--Ј<		@rmeshu
4��Ԁ	8�--Ѐ<	0rmeshu

7H�Ԁ��Ԁ[�--Ѐ<@rmeshu
7H�>>Ѐ<	
+
+0

�$0H`lrmeshq


9u

X�Ԁ
+��<<Ѐ<
+		P

�$0H`lq


9u
K�Ԁ	��<<��������P-��

�$0H`lxrmesh��>>Ѐ<		`

�$0H`lrmeshq


9u
��>>Ј<		`

�$0H`lrmeshq


9u
��>>Ј<		`

�$0H`lrmeshq


9u
ɘ>>Ј<		`

�$0H`lrmeshq


9u
ؙ>>Ј<		`

�$0H`lrmeshq


9u
̚>>Ј<		`

�$0H`lrmeshq


9u
�>>Ј<		`

�$0H`lrmeshq


9u
��FF��������		p���

�$0H`lx
+
��
��
rmesh��>>Ѐ<	`

�$0H`lrmeshq


9u
��Ԁ�<<Ѐ<		�
�$0H`lq


9u��Ԁ	�5>>Ѐ<		�

�$0H`lrmeshq


9u
�6>>Ј<		�

�$0H`lrmeshq


9u
�7>>Ј<		�

�$0H`lrmeshq


9u
h8>>Ј<		�

�$0H`lrmeshq


9u
J9>>Ј<		�

�$0H`lrmeshq


9u
b:>>Ј<		�

�$0H`lrmeshq


9u
D;>>Ј<		�

�$0H`lrmeshq


9u
�<Ԁ�J--Ѐ<	prmeshu9�JԀK--Ѐ<		�rmeshu7�KԀ	Oh>>Ѐ<�

�$0H`lrmeshq


9u
�i--Ѐ<�rmeshu7
kAA��������		��I�

�$0H`lx
��
rmesh
j>>Ѐ<	�

�$0H`lrmeshq


9u

zԀ
�<<Ѐ<		�
�$0H`lq


9u
m	Ԁ	
�	>>Ѐ<		�

�$0H`lrmeshq


9u

J
+Ԁ	
�
+<<Ѐ<	�
�$0H`lq


9u
�
+Ԁ
},AA���������Mn�

�$0H`lxJ�
rmesh
H-Ԁ
�-<<Ѐ<�
�$0H`lq


9u
�.>>Ѐ<�

�$0H`lrmeshq


9u

�/Ԁ
(�--Ѐ<
+		�rmeshu
4
��Ԁ	
/�--Ѐ<	
+
+Prmeshu
7
?�Ԁ
+
��AA��������
+
+`�	�

�$0H`lxJ�
rmesh
�>>Ѐ<
+		�

�$0H`lrmeshq


9u

��Ԁ	
:�--Ѐ<	
+
+prmeshu
4
J�Ԁ
+
��--Ѐ<
+		
rmeshu
7
2�Ԁ	
��AA���������m��

�$0H`lxJ�
rmesh
��AA��������		
���

�$0H`lx��
rmesh
��>>Ѐ<	
+
+�

�$0H`lrmeshq


9u

��Ԁ
+
�<<Ѐ<
+		 

�$0H`lq


9u
��Ԁ	
��>>Ѐ<
+		0


�$0H`lrmeshq


9u

j�Ԁ	
��<<Ѐ<	
+
+�

�$0H`lq


9u
�Ԁ
+
�AA��������
+
+����

�$0H`lx
��
rmesh
�&AA��������
�h�

�$0H`lx��
rmeshkFF��������		@
��

�$0H`lx
+h�
��
rmesh�LL�������
+�������
  
��


 
 

������
-


{LL�������	������0

+


�LL�������	������P

 
��


 
 

������
-


�	LL�������������`

-
��


+



 
-

������
-


},AA��������p
���

�$0H`l8�
4meshd-Ԁ
-.PPЀ<�

J

�$0H`l3
������97
/RRЀ<�
J

�$0H`l4mesh3
������97+0Ԁ��AA��������
-
-0
	��

�$0H`l8�
4mesh�TFF��������		@
�%�

�$0H`l
-��
��
4mesh��FF���������
�Q&�

�$0H`l
-�%�
K�
4mesh�AA��������
-
-@
)!'�

�$0H`l�%�
4mesh��FF��������		P
+z-�

�$0H`l
-R&�
!'�
4mesh�LL�������
-������P

- ��


+LL�������������

+
��


 
 

������
-


�LL�������	������`

-��


+


EEЀ������ 


�%
��


+iEEЀ������		`


�%
��

+l??Ѐ<	
+
+�

� �
+|Ԁ
+�??Ѐ<		p


�
��
+sԀ	
??Ѐ<0


��-

+Ԁ�LL�<	
+@
��

+



 
-

������
-


�EEЀ�������
 D%
��


-6EEЀ������		p
 D%
��

-9??Ѐ<	
-
-`
 E �
-IԀ
-�??Ѐ<		�
 E
��
-@	Ԁ	�	??Ѐ<�
 E��

-�Ԁ�LL�<	
-�
��

+

�ԀLL�<
+	
+�
��

 



 
-

�ԀLL�<
+

SLL�<
 	
-�
��

+�
��

 



 
-

�Ԁ	�``�<	
-p

+

Ԁ	�``�<	
+�
  ��E0@
 


-


�
	�Ԁ
-``�<	�

+


�
	�Ԁ
+^``�<	�

 ��E0@
 


-


�
	�Ԁ	e``�<	
-�

+


�
	3Ԁ	�``�<P

+��E0@
+


+


�
	7LL�������������`

��


+


������
+

+7LL�������	�������

��


+


������
+

W8LL�<	
+�
+ ��

+
+


+


g8Ԁ
+�8LL�<	�

+��

+
+


+


�9Ԁ	4AԀDC``�<	
+�
��E0@
+



+

	�
TCԀ�C``�<
+	
+�
��E0@
+



+

	�
�DԀ	�KLL�<	
+�
+ ��

+
+


+


�KԀ
+�LLL�������
+�������
��


+


������
+

��FF���������
�	&�

�$0H`lx
+��
s�
rmesh��``�<	
+

  ��E0
@
 


-


�
	uԀ
-�``�<	�

+


�
	ȡԀ
+�``�<	�

 ��E0
@
 


-


�
	�Ԁ	�``�<	
-�

+


�
	��Ԁ	��``�<�

+��E0
@
+


+


�
	��FF��������		�
-&�

�$0H`lx
+
+&�
��
rmesh��Ԁ��``�<	
+�
��E0
@
+



+

	�
ˮԀ"�``�<
+	
+�
��E0
@
+



+

	�
��Ԁ	ي--Ѐ<
+		rmeshu4j�Ԁ	��--Ѐ<	
+
+ 
rmeshu7��Ԁ
+�AA��������
+
+0
)'�

�$0H`lx
��
rmesh;�>>Ѐ<
+		

�$0H`lrmeshq


9u
�Ԁ	Z�--Ѐ<	
+
+@
rmeshu4j�Ԁ
+��--Ѐ<
+		 rmeshu7I�Ԁ	��//Ѐ<		0

�

+}�Ԁ	��//Ѐ<�


�

+�&FF���������
ͪ-�

�$0H`lx
+��
'�
rmeshtEEЀ������
+
+P


�% 

+�
�--Ѐ<	�
rmeshu4ԀV--Ѐ<		@rmeshu7�Ԁ	kAA��������		P+�-�

�$0H`lx�-�
rmesh>>Ј<	
+
+`


�$0H`lrmeshq


9u
Ԁ
+z<<Ѐ<
+		`
�$0H`lq


9uԀ	\>>Ѐ<
+		p

�$0H`lrmeshq


9u
O>>Ј<
+		p

�$0H`lrmeshq


9u
�Ԁ	�<<Ѐ<	
+
+p

�$0H`lq


9u�Ԁ
+H�>>Ѐ<	

�$0H`lrmeshq


9u
X�Ԁ��<<Ѐ<		�
�$0H`lq


9u	K�Ԁ	��>>Ѐ<		�

�$0H`lrmeshq


9u
	r�>>Ј<		�

�$0H`lrmeshq


9u
	�Ԁ	��<<Ѐ<	
�$0H`lq


9u	��Ԁ��AA��������
+
+�
I�.�

�$0H`lx�-�
rmesh��
<<Ѐ<
+		�

�M�
Ԁ	t EEЀ������
+
+�


�% 
+�
� EEЀ������		�

�%

+��
�!??Ѐ<	 

� 
+��
�!Ԁ$"??Ѐ<
+		�

�

+�f�"Ԁ	'``�<	
+�

  ��E0@
 


-


�
	�Ԁ
-&``�<	�

+


�
	-'Ԁ
+�'``�<	�
 ��E0@
 


-


�
	�Ԁ	�``�<
+


�
	Y(Ԁ	)``�<@
 ��E0@
 


-


�
	�,FF�������� ��-�

�$0H`l
-z-�
�&�
4mesh��AA��������
-
-�
I�.�

�$0H`lz-�
4mesh�TFF��������		�
K5�

�$0H`l
-�-�
�.�
4mesh�``�<	
+


�
	9,Ԁ�,??Ѐ<	P

�
+��
�,Ԁ%-??Ѐ<
+		�

�
+��-Ԁ	�/``�<@
+��E0@
+


+


�
	D6``�<	
+�

+ ��E0@
+


+


�
	T6Ԁ
+T8Ԁ9``�<	
+`��E0@
+



+

	�
'9Ԁ~9``�<
+	
+���E0@
+



+

	�
v;``�<
+	
+���E0@
+



+

	�
K<Ԁ	�|AA��������		KC5�

�$0H`lx�.�
rmesh��``�<	
 �

  ��E0@
 


-


�
	'�Ԁ
-~�``�<	�

+


�
	ȡԀ
+�``�<	
 ��E0@
 


-


�
	S�Ԁ	�``�<0
+


�
	��Ԁ	��``�<p
 ��E0@
 


-


�
	��FF��������@�5�

�$0H`l
-z-�
�.�
4mesh�AA��������
+


�
	�FF����������o5�

�$0H`lx
+�.�
�-�
rmeshH�Ԁ�``�<	
+���E0@
+



+

	�
�Ԁr�``�<
+	
+ ��E0@
+



+

	�
G�Ԁ	�AA��������
+
+�
iW6�

�$0H`lxC5�
rmesh��Ԁ`�//Ѐ<	�

�
p�Ԁ��//Ѐ<
+		0

�
��//Ј<
+		0

�
��//Ј<
+		0

�
z�//Ј<
+		0

�
��//Ј<
+		0

�
8�Ԁ	t�EEЀ������
+
+�


�% 
+�
ÀEEЀ������		@

�%

+��
��EEЀ�������

�%
+�>

�FF��������		Pk�<�

�$0H`lx
+W6�
p5�
rmesh�>FF���������
=�

�$0H`lx
+V6�
�<�
rmesh��AA��������
+
+�
��=�

�$0H`lx�<�
rmesh�|FF��������		`��D�

�$0H`lx
+�=�
=�
rmesh��FF���������-�D�

�$0H`lx
+�=�
�D�
rmesh�AA��������
+
+�
��E�

�$0H`lx�D�
rmesh4�	EEЀ������
+
+

�% 
+�
��	EEЀ������		p

�%

+��
��	EEЀ�������

�%
+�>

��	Ԁ0�	??Ѐ<	�

�
+�+@�	Ԁ��	??Ѐ<
+		�

�
+��7�	Ԁ	��	``�<	
+
+ ��E0@
+


+


�
	
+�	Ԁ
+a�	``�<	�
+��E0@
+


+


�
	��	``�<	�
+��E0@
+


+


�
	��	Ԁ	��	``�<	
+ 
+ ��E0@
+


+


�
	��	Ԁ
+��	``�<	�
+��E0@
+


+


�
	��	Ԁ	��	``�<
+��E0@
+


+


�
	��	ԀE�	``�<	
+ ��E0@
+



+

	�
U�	Ԁ��	``�<
+	
+���E0@
+



+

	�
�	``�<
+	
+���E0@
+



+

	�
��	Ԁ	��	Ԁ��	``�<	
+0��E0@
+



+

	�
��	Ԁ
�	``�<
+	
+���E0@
+



+

	�
��	Ԁ	�FF��������		��&L�

�$0H`lx
+�E�
�D�
rmesh�>FF��������@MGL�

�$0H`lx
+�E�
'L�
rmesh�``�<	
+0
+ ��E0@
+


+


�
	�Ԁ
+�``�<	�
+��E0@
+


+


�
	p``�<	�
+��E0@
+


+


�
	�``�<	�
+��E0@
+


+


�
	�``�<	�
+��E0@
+


+


�
	-``�<	�
+��E0@
+


+


�
	�``�<	�
+��E0@
+


+


�
	P``�<	�
+��E0@
+


+


�
	��AA��������
 
-�
ic6�

�$0H`l5�
4mesh@�22Ѐ<	PJ
4mesh7P�Ԁ��66Ѐ<
-		�
 F;�Ԁ	]�22Ѐ<		J
4mesh7��Ԁ	�FF��������		k�<�

�$0H`l
-�5�
c6�
4mesh2�RRЀ<	`J

�$0H`l4mesh3
������97B�Ԁ��22Ѐ<		 J
4mesh7;�Ԁ	��22Ѐ<	pJ
4mesh7��Ԁ266Ј<� F	
-%LL����������������


-


������
-

��AA��������
+@�:M�

�$0H`lx'L�
rmesh�|FF��������		���S�

�$0H`lx
+;M�
GL�
rmesh��``�<	
+P
+ ��E0@
+


+


�
	ȡԀ
+�``�<	
+��E0@
+


+


�
	�``�<	
+��E0@
+


+


�
	J�``�<	
+��E0@
+


+


�
	]�``�<	
+��E0@
+


+


�
	��``�<	
+��E0@
+


+


�
	�``�<	
+��E0@
+


+


�
	ݶ``�<	
+��E0@
+


+


�
	�--Ѐ<		rmeshu	4��--Ј<		rmeshu	4��--Ј<		rmeshu	4R�--Ј<		rmeshu	47�--Ј<		rmeshu	4��--Ј<		rmeshu	4��--Ј<		rmeshu	4(}<<Ѐ<
+		 

�3~<<Ј<
+		 

��~Ԁ	�AA��������		0�h[�

�$0H`lx;M�
rmeshtEEЀ������
+
+p

�% 
+�
�EEЀ������		@

�%

+��
��--Ѐ<
+		Prmeshu4J�Ԁ	��--Ј<	
+
+�rmeshu7��Ԁ
+��AA��������
+
+�	}\�

�$0H`lxi[�
rmesh��>>Ѐ<
+		`

�$0H`lrmeshq


9u

+Q�Ԁ	��--Ѐ<	
 
-�
�>�

�$0H`l5�
4mesh�
Ԁt EEЀ������
+�rmeshu
+4��Ԁ
+7�--Ѐ<
+		prmeshu
+7��Ԁ	t EEЀ������
 
-�
 D% 
-�
� EEЀ������		0 D%

-�h
 S22Ѐ<	
-
-J
4mesh70SԀ
-~S22Ѐ<
-		@J
4mesh7/T22Ј<
-		@J
4mesh7�TԀ	�TAA��������		P�]D�

�$0H`l>�
4mesh��FF���������-�D�

�$0H`l
-�=�
^D�
4meshDžRRЀ<		`J

�$0H`l4mesh3
������97��RRЈ<		`J

�$0H`l4mesh3
������97��Ԁ	,�PPЀ<	�
J

�$0H`l3
������97
	<�Ԁ�22Ѐ<	
-
-0J
4mesh7�Ԁ
-,(22Ѐ<		pJ
4mesh7	�(Ԁ	C)22Ѐ<	�J
4mesh7	S)ԀeAA��������
-
-@�mE�

�$0H`l^D�
4mesh;eRRЀ<
-		�J

�$0H`l4mesh3
������97	fԀ	~f22Ѐ<	
-
-PJ
4mesh7	�fԀ
-�f22Ѐ<
-		�J
4mesh7	�gԀ	t�EEЀ������
-
-` D% 
-�
��<<��������		���K�

�$0H`l4mesh��RRЀ<	J

�$0H`l4mesh3
������97
-��Ԁ�PPЀ<		�
J
	
�$0H`l3
������97

-
-��Ԁ	�RRЀ<		�J

�$0H`l4mesh3
������97
-��Ԁ	��PPЀ<	
J
	
�$0H`l3
������97

-
-��Ԁ�&FF�������� M/L�

�$0H`l
-�=�
	�K�
4mesh�<<��������
-
-p��L�

�$0H`l4mesh�RRЀ<
-		�J

�$0H`l4mesh3
������97؜Ԁ	~�PPЀ<	
-
-�
J

�$0H`l3
������97
��Ԁ
-e�RRЀ<	
-
-�J

�$0H`l4mesh3
������97u�Ԁ
-՞PPЀ<
-		�
J

-
�$0H`l3
������97
��Ԁ	�TFF��������		�˟S�

�$0H`l
-	/L�

-�L�
4mesh=AA��������
-
-��T�

�$0H`l�S�
4mesh4�	EEЀ������
-
-� D% 
-�
��	EEЀ������		 D%

-��
��FF��������		�@[�

�$0H`l
-	/L�

-�T�
4mesh�$22Ѐ<		 J
4mesh7
-
-W%22Ј<		 J
4mesh7
-
-)&22Ј<		 J
4mesh7
-
-�&22Ј<		 J
4mesh7
-
-(22Ј<		 J
4mesh7
-
-�(22Ј<		 J
4mesh7
-
-�)22Ј<		 J
4mesh7
-
-��AA��������
-
-�	)\�

�$0H`lA[�
4mesh�TAA��������		0�b�

�$0H`l
-)\�
4mesh=AA��������
-
-�)�c�

�$0H`l�b�
4mesh��AA��������		@+�j�

�$0H`l
-�c�
4meshtEEЀ������
-
-� D% 
-�
�EEЀ������		P D%

-��
��AA��������
-
-�Ikk�

�$0H`l�j�
4mesht EEЀ������
-
- D% 
-�
� EEЀ������		` D%

-��
�TAA��������		pK$r�

�$0H`l
-kk�
4mesh=AA��������
-
-is�

�$0H`l$r�
4mesht�EEЀ������
-
-  D% 
-	�
ÀEEЀ������		� D%

-	��
��AA��������		�k�y�

�$0H`l
-s�
4mesh�TAA��������		��f��

�$0H`l
-s�
4mesh�:22Ѐ<
-		�J
4mesh7r;Ԁ	�;22Ѐ<	
-
-@J
4mesh7<Ԁ
-=AA��������
-
-P�N��

�$0H`lf��
4mesh;=RRЀ<
-		�J

�$0H`l4mesh3
������97>Ԁ	~>22Ѐ<	
-
-`J
4mesh7�>Ԁ
-�>22Ѐ<
-		�J
4mesh7u?Ԁ	4�	EEЀ������
-
-p D% 
-
-�
��<<��������		�����

�$0H`l4mesh��RRЀ<	
-
-�J

�$0H`l4mesh3
������97��Ԁ
-�PPЀ<
-		�
J

�$0H`l3
������97

��Ԁ	�RRЀ<
-		J

�$0H`l4mesh3
������97
�RRЈ<
-		J

�$0H`l4mesh3
������97
��Ԁ	q�PPЀ<	
+�

�% 
+�
�T<<��������		��b�

�$0H`lxrmesh�U>>Ѐ<	
 
-�
J

�$0H`l3
������97

��Ԁ
-	��AA��������
+�

�$0H`lrmeshq


9u
�UԀ
+�U<<Ѐ<
+		�
+
�$0H`lq


9u�VԀ	�V>>Ѐ<
+		�

�$0H`lrmeshq


9u
PWԀ	�W<<Ѐ<	
 
-����

�$0H`l��
4mesh	�LAA��������		ˠ��

�$0H`l��
4mesh	QAA��������
+�
�$0H`lq


9u�WԀ
+eAA��������
+
+�)�c�

�$0H`lx�b�
rmesht�EEЀ������
+
+�

�% 
+	�
ÀEEЀ������		�

�%

+	��
��AA��������		�+�j�

�$0H`lx
+�c�
rmesh��AA��������
+
+I�k�

�$0H`lx�j�
rmesh�TAA��������		�K$r�

�$0H`lx
+�k�
rmesheAA��������
+
+i4s�

�$0H`lx$r�
rmesh4�	EEЀ������
+
+ 

�% 
+
+�
��	EEЀ������		�

�%

+
+��
��AA��������		�k�y�

�$0H`lx
+4s�
rmesh��AA��������
 
-�餑�

�$0H`l���
4mesh	��AA��������		 �A��

�$0H`l���
4mesh
\ No newline at end of file
+0��z�

�$0H`lx�y�
rmesh�TAA��������		�f��

�$0H`lx
+�z�
rmesh��AA��������		���

�$0H`lx
+�z�
rmesh	tEEЀ������
+
+P

�% 	
+�
	�EEЀ������		 

�%
	
+��
	��--Ѐ<
+		0rmeshu4	J�Ԁ		��--Ѐ<	
+
+`rmeshu7	��Ԁ
+	��AA��������
+
+p���

�$0H`lx��
rmesh	�>>Ѐ<
+		@

�$0H`lrmeshq


9u
	��Ԁ		:�--Ѐ<	
+
+�rmeshu4	J�Ԁ
+	��--Ѐ<
+		Prmeshu7	D�Ԁ		t EEЀ������
+
+�

�% 
+
+�
	�L<<��������		`ˠ��

�$0H`lxrmesh	�M>>Ѐ<	
+
+�

�$0H`lrmeshq


9u
	�MԀ
+	�M<<Ѐ<
+		p
�$0H`lq


9u
	�N<<Ј<
+		p
�$0H`lq


9u
	POԀ		�O>>Ѐ<
+		�

�$0H`lrmeshq


9u

	6PԀ		�P<<Ѐ<	
+
+�
�$0H`lq


9u
	�PԀ
+	�AA��������
+
+����

�$0H`lx���
rmesh	t�EEЀ������
+
+�

�% 
+
�
	ÀEEЀ������		�

�%

+
��
	��AA��������		��A��

�$0H`lx��
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-5-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-5-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-reactive-regression-test-5-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-reactive-regression-test-5-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,357 +1,418 @@
-��i�?<<��������		k?�

�$0H`l4mesh�?RRЀ<	
+��i
+&>>Ј<		

�$0H`lrmeshq


9u

�?AA��������		k?�

�$0H`lx$�
rmesh�?>>Ѐ<	
 
-J

�$0H`l4mesh3
������97
�@RRЈ<	
+

�$0H`lrmeshq


9u

�@>>Ј<	
 
-J

�$0H`l4mesh3
������97
BRRЈ<	
+

�$0H`lrmeshq


9u

�A>>Ј<	
 
-J

�$0H`l4mesh3
������97
ACRRЈ<	
+

�$0H`lrmeshq


9u

�B>>Ј<	
 
-J

�$0H`l4mesh3
������97
cDRRЈ<	
+

�$0H`lrmeshq


9u

�C>>Ј<	
 
-J

�$0H`l4mesh3
������97
aERRЈ<	
+

�$0H`lrmeshq


9u

�D>>Ј<	
 
-J

�$0H`l4mesh3
������97
_FRRЈ<	
+

�$0H`lrmeshq


9u

�E>>Ј<	
 
-J

�$0H`l4mesh3
������97
��AA��������
+

�$0H`lrmeshq


9u

��>>Ѐ<		 

�$0H`lrmeshq


9u

��>>Ј<		 

�$0H`lrmeshq


9u

��>>Ј<		 

�$0H`lrmeshq


9u

��AA��������
 
-���

�$0H`l?�
4mesh��RRЈ<
-		J

�$0H`l4mesh3
������97
��Ԁ	$�PPЀ<	
+���

�$0H`lx?�
rmesh��>>Ј<		 

�$0H`lrmeshq


9u

��>>Ѐ<
+		0

�$0H`lrmeshq


9u
��Ԁ	�<<Ѐ<	
 
- 
J

�$0H`l3
������97


��Ԁ
-��RRЀ<	
+ 
�$0H`lq


9u
��Ԁ
+��--Ј<		@rmeshu
4��--Ј<		@rmeshu
4��--Ј<		@rmeshu
4u�Ԁ��>>Ѐ<	
 
-0J

�$0H`l4mesh3
������97
��RRЈ<	
+0

�$0H`lrmeshq


9u

��Ԁ
+�<<Ѐ<
+		P

�$0H`lq


9u
�Ԁ	$�>>Ѐ<		`

�$0H`lrmeshq


9u
*�>>Ј<		`

�$0H`lrmeshq


9u
'�>>Ј<		`

�$0H`lrmeshq


9u
�FF��������		p���

�$0H`lx
+
��
��
rmeshϩԀY�<<Ѐ<		�
�$0H`lq


9u6>>Ѐ<		�

�$0H`lrmeshq


9u
�7>>Ј<		�

�$0H`lrmeshq


9u
�9>>Ј<		�

�$0H`lrmeshq


9u
�:>>Ј<		�

�$0H`lrmeshq


9u
�;>>Ј<		�

�$0H`lrmeshq


9u
�JԀ`K--Ѐ<		�rmeshu7�hAA��������
 
-0J

�$0H`l4mesh3
������97
��RRЈ<	
+@�h�

�$0H`lx��
rmesh
�AA��������		��I�

�$0H`lx
��
rmesh
�Ԁ
1	<<Ѐ<		�
�$0H`lq


9u

+>>Ѐ<		�

�$0H`lrmeshq


9u

Ԁ
}�--Ѐ<
+		�rmeshu
4
��Ԁ	
��--Ѐ<	
 
-0J

�$0H`l4mesh3
������97
�RRЈ<	
+Prmeshu
7
l�Ԁ
+
��AA��������
 
-0J

�$0H`l4mesh3
������97
8�RRЈ<	
+`�	�

�$0H`lxJ�
rmesh
��>>Ѐ<
+		�

�$0H`lrmeshq


9u

��Ԁ	
��--Ѐ<	
 
-0J

�$0H`l4mesh3
������97
-�RRЈ<	
+prmeshu
4
w�Ԁ
+
��--Ѐ<
+		
rmeshu
7
�Ԁ	
��AA��������		
���

�$0H`lx��
rmesh
�>>Ѐ<	
 
-0J

�$0H`l4mesh3
������97
a�RRЈ<	
+�

�$0H`lrmeshq


9u

ǩԀ
+
Q�<<Ѐ<
+		 

�$0H`lq


9u
a�Ԁ	
.�>>Ѐ<
+		0


�$0H`lrmeshq


9u

>�Ԁ	
��<<Ѐ<	
 
-0J

�$0H`l4mesh3
������97

-�Ԁk
22Ѐ<
-		 J
4mesh7

k
Ԁ	ck
22Ѐ<	
+�

�$0H`lq


9u
1�Ԁ
+
��AA��������
 
-@J
4mesh7

�k
Ԁ
-��<<��������		0���

�$0H`l4mesh�RRЀ<	
-
-PJ

�$0H`l4mesh3
������97A�RRЈ<	
-
-PJ

�$0H`l4mesh3
������97H�RRЈ<	
-
-PJ

�$0H`l4mesh3
������97=�RRЈ<	
-
-PJ

�$0H`l4mesh3
������97D�RRЈ<	
-
-PJ

�$0H`l4mesh3
������97K�RRЈ<	
-
-PJ

�$0H`l4mesh3
������97[�RRЈ<	
-
-PJ

�$0H`l4mesh3
������97P�RRЀ<		@J

�$0H`l4mesh3
������97o�Ԁ�HRRЀ<	
-
-`J

�$0H`l4mesh3
������97JRRЈ<	
-
-`J

�$0H`l4mesh3
������97JKRRЈ<	
-
-`J

�$0H`l4mesh3
������97cLRRЈ<	
-
-`J

�$0H`l4mesh3
������97�MRRЈ<	
-
-`J

�$0H`l4mesh3
������97�NRRЈ<	
-
-`J

�$0H`l4mesh3
������97�ORRЈ<	
-
-`J

�$0H`l4mesh3
������97�P22Ѐ<	
-
-pJ
4mesh73QԀ
-�g22Ѐ<		PJ
4mesh7�hԀ��AA��������
-
-����

�$0H`l
��
4meshčRRЀ<
-		`J

�$0H`l4mesh3
������97ԍԀ	"�22Ѐ<	
-
-�J
4mesh7��Ԁ
-K�22Ѐ<
-		pJ
4mesh7[�Ԁ	<<��������		���

�$0H`l4mesh6RRЀ<	
-
-�J

�$0H`l4mesh3
������97FRRЈ<	
-
-�J

�$0H`l4mesh3
������97z RRЈ<	
-
-�J

�$0H`l4mesh3
������97�!RRЈ<	
-
-�J

�$0H`l4mesh3
������97�"RRЈ<	
-
-�J

�$0H`l4mesh3
������97�#RRЈ<	
-
-�J

�$0H`l4mesh3
������97�$RRЈ<	
-
-�J

�$0H`l4mesh3
������97p7RRЀ<		�J

�$0H`l4mesh3
������97�8Ԁ
�{RRЀ<	
-
-�J

�$0H`l4mesh3
������97
�|RRЈ<	
-
-�J

�$0H`l4mesh3
������97
�}RRЈ<	
-
-�J

�$0H`l4mesh3
������97
�~RRЈ<	
-
-�J

�$0H`l4mesh3
������97
�RRЈ<	
-
-�J

�$0H`l4mesh3
������97
��RRЈ<	
-
-�J

�$0H`l4mesh3
������97
��RRЈ<	
-
-�J

�$0H`l4mesh3
������97
�22Ѐ<	
-
-�J
4mesh7
��Ԁ
-
o�22Ѐ<		�J
4mesh7
J�22Ј<		�J
4mesh7
A�Ԁ
��AA��������
-
-��1�

�$0H`l�
4mesh
��RRЀ<
-		�J

�$0H`l4mesh3
������97
��Ԁ	
�22Ѐ<	
-
-�J
4mesh7
��Ԁ
-
"�22Ѐ<
-		�J
4mesh7
2�Ԁ	
�UԀ
�VPPЀ<		�
J

�$0H`l3
������97

zWRRЀ<		�J

�$0H`l4mesh3
������97
�XԀ
�d<<��������
-
-���

�$0H`l4mesh
�AA��������		
�7�

�$0H`l�
4mesh
>�RRЀ<	
-
-
J

�$0H`l4mesh3
������97
�Ԁ
-
��PPЀ<
-		

J

�$0H`l3
������97

��Ԁ	
��RRЀ<
-		 
J

�$0H`l4mesh3
������97
��Ԁ	
	�PPЀ<	
-
-

J

�$0H`l3
������97

��Ԁ
-�LL�������
-������ 

+����

�$0H`lx
��
rmesh�FF��������		@
��

�$0H`lx
+h�
��
rmesh3LL�������
+�������
  
��


 
 

������
-


�LL�������	������0

+


_	LL�������	������P

 
��


 
 

������
-


��AA��������
-
-0
	��

�$0H`l8�
4meshUFF��������		@
�%�

�$0H`l
-��
��
4mesh��AA��������
-
-@
)!'�

�$0H`l�%�
4mesh$�FF��������		P
+z-�

�$0H`l
-R&�
!'�
4meshLL�������
-������P

- ��


-
-

������
-


,
LL�������	������`

-��


-
-

������
-


�EEЀ������		p
 D%
��

-�??Ѐ<	
+


�EEЀ������		`


�%
��

+??Ѐ<	
 
-`
 E �
-vԀ
-	??Ѐ<		�
 E
��
-�Ԁ�LL�<
+�

� �
+�Ԁ
+7??Ѐ<		p


�
��
+�Ԁ�LL�<
 	
-�
��

+�
��

 



 
-

�Ԁ	�``�<	
-p

+

�Ԁ	;``�<	
+�
  ��E0@
 


-


�
	�Ԁ
-�``�<	�

+


�
	Ԁ
+�``�<	�

 ��E0@
 


-


�
	n``�<	
-�

- ��E0
@
-


-


�
	�``�<	
-�

+


�
	�7LL�������	�������

��


+


������
+

�7LL�<	
+�
+ ��

+
+


+


H9LL�<	�

+��

+
+


+


:LL�<	
+�
+ ��

+
+


+


�<LL�<	
+�
+ ��

+
+


+


2ALL�<	
+�
+ ��

+
+


+


�CԀDD``�<
+	
+�
��E0@
+



+

	�
TDԀ	KLL�<	
+�
+ ��

+
+


+


�KԀ
+&LLL�������
+�������
��


+


������
+

��AA��������
+
+
	p�

�$0H`lx
��
rmesh �``�<	
+

  ��E0
@
 


-


�
	�Ԁ
-e``�<	�

+


�
	��Ԁ
+��``�<	�

 ��E0
@
 


-


�
	/``�<	
-�

- ��E0@
-


-


�
	'``�<	
-�

- ��E0@
-


-


�
	�Ԁ
-�``�<	�

-��E0@
-


-


�
	��AA��������
-
-�
I�.�

�$0H`lz-�
4meshUFF��������		�
K5�

�$0H`l
-�-�
�.�
4mesh �``�<	
-�

- ��E0@
-


-


�
	�``�<	
-�

- ��E0@
-


-


�
	T�Ԁ
-�``�<	�

-��E0@
-


-


�
	��AA��������
-
-�
ic6�

�$0H`l5�
4mesh}�Ԁ��66Ѐ<
-		�
 F�Ԁ	��22Ѐ<		J
4mesh7o�Ԁ��22Ѐ<		 J
4mesh7��ԀEEЀ������
-
-�
 D% 

-�
��AA��������
-
-�
�>�

�$0H`l5�
4mesh EEЀ������
-
-�
 D% 
-�
8!EEЀ������		0 D%

-�h
�R22Ѐ<	
+


�
	��Ԁ��``�<
+	
+�
��E0
@
+



+

	�
˯Ԁ	.�--Ѐ<
+		rmeshu4>�Ԁ	��--Ѐ<	
 
-J
4mesh7]SԀ
-�T22Ј<
-		@J
4mesh7�TԀ	RUAA��������		P�]D�

�$0H`l>�
4mesh}URRЀ<	
+ 
rmeshu7�Ԁ
+��AA��������
 
-J

�$0H`l4mesh3
������97�VRRЈ<	
+0
)'�

�$0H`lx
��
rmesh��>>Ѐ<
+		

�$0H`lrmeshq


9u
��Ԁ	�--Ѐ<	
 
-J

�$0H`l4mesh3
������97�WRRЈ<	
+@
rmeshu4��Ԁ
+
�--Ѐ<
+		 rmeshu7�Ԁ	A�//Ѐ<		0

�

+EEЀ������
 
-J

�$0H`l4mesh3
������97�XRRЈ<	
+P


�% 

+�
5Ԁ�--Ѐ<		@rmeshu7�AA��������		P+�-�

�$0H`lx�-�
rmesh�>>Ѐ<	
 
-J

�$0H`l4mesh3
������97�YRRЈ<	
+`


�$0H`lrmeshq


9u

	>>Ј<	
 
-J

�$0H`l4mesh3
������97�ZRRЈ<	
+`


�$0H`lrmeshq


9u
�	>>Ј<	
 
-J

�$0H`l4mesh3
������97%\RRЈ<	
+`


�$0H`lrmeshq


9u
�
+>>Ј<	
 
-J

�$0H`l4mesh3
������97J�RRЈ<		`J

�$0H`l4mesh3
������97i�ԀR�RRЀ<	
+`


�$0H`lrmeshq


9u
�>>Ј<	
 
- J

�$0H`l4mesh3
������97G�RRЈ<	
+`


�$0H`lrmeshq


9u
�>>Ј<	
 
- J

�$0H`l4mesh3
������97{�RRЈ<	
+`


�$0H`lrmeshq


9u
�
>>Ј<	
 
- J

�$0H`l4mesh3
������97��RRЈ<	
+`


�$0H`lrmeshq


9u
DԀ
+�<<Ѐ<
+		`
�$0H`lq


9u�Ԁ	�>>Ј<
+		p

�$0H`lrmeshq


9u
�Ԁ	<<Ѐ<	
 
- J

�$0H`l4mesh3
������97w�RRЈ<	
+p

�$0H`lq


9u�Ԁ
+��Ԁ�<<Ѐ<		�
�$0H`lq


9u	�Ԁ��AA��������
 
- J

�$0H`l4mesh3
������97u�RRЈ<	
+�
I�.�

�$0H`lx�-�
rmesh�
<<Ѐ<
+		�

�!�
Ԁ	 EEЀ������
 
- J

�$0H`l4mesh3
������97��RRЈ<	
+�


�% 
+�
8!EEЀ������		�

�%

+��
"Ԁ�"??Ѐ<
+		�

�

+�f�"Ԁ	�"``�<	
+�

+ ��E0@
+


+


�
	�$``�<	
+�

+ ��E0@
+


+


�
	�&``�<	
+�

+ ��E0@
+


+


�
	(``�<	�
+��E0@
+


+


�
	�*``�<	
+�

+ ��E0@
+


+


�
	-Ԁ�-??Ѐ<
+		�

�
+��-Ԁ	�5``�<	
+�

+ ��E0@
+


+


�
	�6Ԁ
+T9Ԁ<``�<
+	
+���E0@
+



+

	�
<Ԁ	�|AA��������		KC5�

�$0H`lx�.�
rmesh �``�<	
+�

+ ��E0@
+


+


�
	��Ԁ
+��``�<	
+��E0@
+


+


�
	H�Ԁ�``�<
+	
+ ��E0@
+



+

	�
�Ԁ	��AA��������
+
+�
iW6�

�$0H`lxC5�
rmesh��Ԁ�//Ѐ<
+		0

�
'�Ԁ	��//Ј<
+		0

�
��Ԁ	��//Ј<
+		0

�
�Ԁ	�EEЀ������
+
+�


�% 
+�
8�EEЀ������		@

�%

+��
$FF��������		Pk�<�

�$0H`lx
+W6�
p5�
rmesh��AA��������
+
+�
��=�

�$0H`lx�<�
rmesh}FF��������		`��D�

�$0H`lx
+�=�
=�
rmesh��AA��������
+
+�
��E�

�$0H`lx�D�
rmesh��	EEЀ������
+
+

�% 
+�
��	EEЀ������		p

�%

+��
m�	Ԁ��	??Ѐ<
+		�

�
+���	Ԁ	b�	``�<	
+
+ ��E0@
+


+


�
	7�	Ԁ
+��	``�<	�
+��E0@
+


+


�
	G�	``�<	�
+��E0@
+


+


�
	��	``�<	
+ 
+ ��E0@
+


+


�
	L�	``�<	
+ 
+ ��E0@
+


+


�
	��	``�<	
+ 
+ ��E0@
+


+


�
	��	Ԁ
+��	``�<	�
+��E0@
+


+


�
	��	Ԁ��	``�<
+	
+���E0@
+



+

	�
��	Ԁ	��	Ԁ��	``�<
+	
+���E0@
+



+

	�
��	Ԁ	$FF��������		��&L�

�$0H`lx
+�E�
�D�
rmesh``�<	
+0
+ ��E0@
+


+


�
	�Ԁ
+�
``�<	�
+��E0@
+


+


�
		``�<	�
+��E0@
+


+


�
	�``�<	�
+��E0@
+


+


�
	�``�<	�
+��E0@
+


+


�
	�``�<	�
+��E0@
+


+


�
	��AA��������
 
- J

�$0H`l4mesh3
������97��22Ѐ<	
+@�:M�

�$0H`lx'L�
rmesh}FF��������		���S�

�$0H`lx
+;M�
GL�
rmesh �``�<	
+P
+ ��E0@
+


+


�
	��Ԁ
+��``�<	
+��E0@
+


+


�
	��``�<	
+��E0@
+


+


�
	�``�<	
+��E0@
+


+


�
	��``�<	
+��E0@
+


+


�
	�``�<	
+��E0@
+


+


�
	��``�<	
+��E0@
+


+


�
	v�``�<	
+��E0@
+


+


�
	7�--Ѐ<		rmeshu	4
�--Ј<		rmeshu	4ݹ--Ј<		rmeshu	4��--Ј<		rmeshu	4��--Ј<		rmeshu	4M�--Ј<		rmeshu	4M�--Ј<		rmeshu	4�~<<Ј<
+		 

��~Ԁ	��AA��������
 
-0J
4mesh7I�Ԁ
-�(22Ѐ<		pJ
4mesh7	�)Ԁ�dAA��������
+`��T�

�$0H`lx�S�
rmeshAA��������		0�h[�

�$0H`lx;M�
rmeshEEЀ������
 
-@�mE�

�$0H`l^D�
4mesh�eRRЀ<
-		�J

�$0H`l4mesh3
������97	�eԀ	"f22Ѐ<	
+p

�% 
+�
8
EEЀ������		@

�%

+��
�--Ѐ<
+		Prmeshu4�Ԁ	l�--Ѐ<	
 
-PJ
4mesh7	�fԀ
-Tg22Ѐ<
-		�J
4mesh7	dgԀ	�EEЀ������
+�rmeshu7l�--Ј<	
 
-` D% 
-�
��Ԁ��PPЀ<		�
J
	
�$0H`l3
������97

-
-��RRЀ<		�J

�$0H`l4mesh3
������97
-��Ԁ��<<��������
+�rmeshu7��Ԁ
+�AA��������
 
-p��L�

�$0H`l4mesh��RRЀ<
-		�J

�$0H`l4mesh3
������97��Ԁ	��PPЀ<	
+�	}\�

�$0H`lxi[�
rmesh�>>Ѐ<
+		`

�$0H`lrmeshq


9u

+%�Ԁ	��--Ѐ<	
 
-�
J

�$0H`l3
������97
��Ԁ
-ݝRRЀ<	
+�rmeshu
+4�Ԁ
+��--Ѐ<
+		prmeshu
+7��Ԁ	 EEЀ������
 
-�J

�$0H`l4mesh3
������97��Ԁ
-Z�PPЀ<
-		�
J

-
�$0H`l3
������97
j�Ԁ	UFF��������		�˟S�

�$0H`l
-	/L�

-�L�
4mesh�<AA��������
+�

�% 
+�
�T<<��������		��b�

�$0H`lxrmeshU>>Ѐ<	
 
-��T�

�$0H`l�S�
4mesh��	EEЀ������
+�

�$0H`lrmeshq


9u
�UԀ
+IV<<Ѐ<
+		�
+
�$0H`lq


9uYVԀ	W>>Ѐ<
+		�

�$0H`lrmeshq


9u
$WԀ	rW<<Ѐ<	
 
-� D% 
-�
��	EEЀ������		 D%

-��
$�FF��������		�@[�

�$0H`l
-	/L�

-�T�
4mesh�$22Ѐ<		 J
4mesh7
-
-�%22Ј<		 J
4mesh7
-
-�&22Ј<		 J
4mesh7
-
-X'22Ј<		 J
4mesh7
-
-`(22Ј<		 J
4mesh7
-
-2)22Ј<		 J
4mesh7
-
-
*22Ј<		 J
4mesh7
-
-��AA��������
+�
�$0H`lq


9uXԀ
+�dAA��������
 
-�	)\�

�$0H`lA[�
4mesh�TAA��������		0�b�

�$0H`l
-)\�
4mesh�<AA��������
+�)�c�

�$0H`lx�b�
rmesh�EEЀ������
 
-�)�c�

�$0H`l�b�
4mesh�AA��������		@+�j�

�$0H`l
-�c�
4meshEEЀ������
+�

�% 
+	�
8�EEЀ������		�

�%

+	��
�AA��������		�+�j�

�$0H`lx
+�c�
rmesh��AA��������
 
-� D% 
-�
8
EEЀ������		P D%

-��
��AA��������
+I�k�

�$0H`lx�j�
rmesh�TAA��������		�K$r�

�$0H`lx
+�k�
rmesh�dAA��������
 
-�Ikk�

�$0H`l�j�
4mesh EEЀ������
+i4s�

�$0H`lx$r�
rmesh��	EEЀ������
 
- D% 
-�
8!EEЀ������		` D%

-��
�TAA��������		pK$r�

�$0H`l
-kk�
4mesh�<AA��������
+ 

�% 
+
+�
�AA��������		�k�y�

�$0H`lx
+4s�
rmesh��AA��������
 
-is�

�$0H`l$r�
4mesh�EEЀ������
+0��z�

�$0H`lx�y�
rmesh�TAA��������		�f��

�$0H`lx
+�z�
rmesh�dAA��������
 
-  D% 
-	�
8�EEЀ������		� D%

-	��
�AA��������		�k�y�

�$0H`l
-s�
4mesh��AA��������
+@�v��

�$0H`lxf��
rmesh�AA��������		���

�$0H`lx
+�z�
rmesh	EEЀ������
 
-0��z�

�$0H`l�y�
4mesh�TAA��������		��f��

�$0H`l
-s�
4mesh6;22Ѐ<
-		�J
4mesh7F;Ԁ	�;22Ѐ<	
+P

�% 	
+�
	8
EEЀ������		 

�%
	
+��
	�--Ѐ<
+		0rmeshu4	�Ԁ		l�--Ѐ<	
 
-@J
4mesh7-<Ԁ
-�<AA��������
+`rmeshu7	��Ԁ
+	��AA��������
 
-P�N��

�$0H`lf��
4mesh�=RRЀ<
-		�J

�$0H`l4mesh3
������97�=Ԁ	">22Ѐ<	
+p���

�$0H`lx��
rmesh	��>>Ѐ<
+		@

�$0H`lrmeshq


9u
	��Ԁ		��--Ѐ<	
 
-`J
4mesh7�>Ԁ
-9?22Ѐ<
-		�J
4mesh7I?Ԁ	��	EEЀ������
+�rmeshu4	w�Ԁ
+	�--Ѐ<
+		Prmeshu7	�Ԁ		 EEЀ������
 
-p D% 
-
-�
�<<��������		�����

�$0H`l4mesh6�RRЀ<	
+�

�% 
+
+�
	�L<<��������		`ˠ��

�$0H`lxrmesh	M>>Ѐ<	
 
-�J

�$0H`l4mesh3
������97��Ԁ
-��PPЀ<
-		�
J

�$0H`l3
������97

��Ԁ	��RRЈ<
-		J

�$0H`l4mesh3
������97
��Ԁ	��PPЀ<	
+�

�$0H`lrmeshq


9u
	�MԀ
+	O<<Ј<
+		p
�$0H`lq


9u
	$OԀ		�O>>Ѐ<
+		�

�$0H`lrmeshq


9u

	
+PԀ		XP<<Ѐ<	
 
-�
J

�$0H`l3
������97

��Ԁ
-	��AA��������
+�
�$0H`lq


9u
	�PԀ
+	��AA��������
 
-����

�$0H`l��
4mesh	�LAA��������		ˠ��

�$0H`l��
4mesh	�PAA��������
+����

�$0H`lx���
rmesh	�EEЀ������
 
-�餑�

�$0H`l���
4mesh	�AA��������		 �A��

�$0H`l���
4mesh
\ No newline at end of file
+�

�% 
+
�
	8�EEЀ������		�

�%

+
��
	�AA��������		��A��

�$0H`lx��
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-simplest-regression-test-0-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-simplest-regression-test-0-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-simplest-regression-test-0-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-simplest-regression-test-0-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,9 +1,9 @@
-��i��<<�����������

�$0H`l4mesh�RRЀ<J

�$0H`l4mesh3
������97
��Ԁ��PPЀ<
J

�$0H`l3
������97


��Ԁ�RRЀ< J

�$0H`l4mesh3
������97
��Ԁ��PPЀ<
J

�$0H`l3
������97


��ԀJO
AA�������� JO
�

�$0H`l��
4mesh#jAA��������0�i�

�$0H`lO
�
4meshj�AA��������0j��

�$0H`lj�
4mesh
�AA��������@�
-�

�$0H`l��
4mesh
JO
AA��������@���

�$0H`l�
4mesh
#jAA��������P��

�$0H`l��
4mesh
j�AA��������P�2�

�$0H`l��
4mesh�#LL�������������` 
��


+��i��<<�����������

�$0H`lxrmesh�>>Ѐ<

�$0H`lrmeshq


9u

��ԀO�<<Ѐ<
�$0H`lq


9u

_�Ԁ+�>>Ѐ< 

�$0H`lrmeshq


9u

;�Ԁ��<<Ѐ<
�$0H`lq


9u

-�ԀJO
AA�������� JO
�

�$0H`lx��
rmesh#jAA��������0�i�

�$0H`lxO
�
rmeshj�AA��������0j��

�$0H`lxj�
rmesh
�AA��������@�
+�

�$0H`lx��
rmesh
JO
AA��������@���

�$0H`lx�
rmesh
#jAA��������P��

�$0H`lx��
rmesh
j�AA��������P�2�

�$0H`lx��
rmesh�#LL�������������` 
��


 

������
 


�#LL�������������`
��


 

������
-


�$EEЀ������p D% 
�
�%??Ѐ<p E ��%Ԁ&LL�<� ��

+


�$EEЀ������p

�% 
�
�%??Ѐ<p

� ��%Ԁ&LL�<� ��

 



 

�&Ԁ(���<� ��E�@
 


@@ -19,7 +19,7 @@
 


 


�
	ld�Ԁ�����<� ��E�
@
 



-

	�
l��Ԁ�AA���������M�

�$0H`l3�
4meshJO
AA������������

�$0H`lM�
4mesh��
���<� ��E�@
+

	�
l��Ԁ�AA���������M�

�$0H`lx3�
rmeshJO
AA������������

�$0H`lxM�
rmesh��
���<� ��E�@
 


 


�
	l��
Ԁ�
���<� ��E�@
 



@@ -61,7 +61,7 @@
 


 


�
	l4eԀ�e���<`
 ��E�@
 



-

	�
l{fԀ#jAA��������p
3�&�

�$0H`l��
4meshj�AA��������p
�t'�

�$0H`l�&�
4mesht(	���<�
 ��E�@
+

	�
l{fԀ#jAA��������p
3�&�

�$0H`lx��
rmeshj�AA��������p
�t'�

�$0H`lx�&�
rmesht(	���<�
 ��E�@
 


 


�
	l�(	Ԁ�(	���<�
 ��E�@
 



@@ -105,8 +105,8 @@
 


 


�
	l��ԀC����< ��E�@
 



-

	�
l�Ԁ�AA�������� S�.�

�$0H`lu'�
4meshJO
AA�������� 
-/�

�$0H`l�.�
4mesh,�
���<0 ��E�@
+

	�
l�Ԁ�AA�������� S�.�

�$0H`lxu'�
rmeshJO
AA�������� 
+/�

�$0H`lx�.�
rmesh,�
���<0 ��E�@
 


 


�
	l<�
Ԁ��
���<0 ��E�@
 



@@ -146,7 +146,7 @@
 


 


�
	l�dԀ;e���<� ��E�@
 



-

	�
l�eԀ#jAA���������s06�

�$0H`l/�
4meshj�AA���������*�6�

�$0H`l06�
4mesh$(	���<� ��E� @
+

	�
l�eԀ#jAA���������s06�

�$0H`lx/�
rmeshj�AA���������*�6�

�$0H`lx06�
rmesh$(	���<� ��E� @
 


 


�
	l4(	Ԁ�(	���<� ��E� @
 



@@ -190,7 +190,7 @@
 


 


�
	l��Ԁ����<p ��E�)@
 



-

	�
l��Ԁ�AA�����������=�

�$0H`l�6�
4meshJO
AA���������JX>�

�$0H`l�=�
4mesh��
���<� ��E�*@
+

	�
l��Ԁ�AA�����������=�

�$0H`lx�6�
rmeshJO
AA���������JX>�

�$0H`lx�=�
rmesh��
���<� ��E�*@
 


 


�
	l�
ԀW�
���<� ��E�*@
 



@@ -230,7 +230,7 @@
 


 


�
	l�dԀe���<  ��E�3@
 



-

	�
l�eԀ#jAA��������0�rE�

�$0H`lX>�
4meshj�AA��������0j�E�

�$0H`lsE�
4mesh�'	���<@ ��E�4@
+

	�
l�eԀ#jAA��������0�rE�

�$0H`lxX>�
rmeshj�AA��������0j�E�

�$0H`lxsE�
rmesh�'	���<@ ��E�4@
 


 


�
	l(	Ԁc(	���<@ ��E�4@
 



@@ -274,7 +274,7 @@
 


 


�
	l��Ԁ�����<� ��E�=@
 



-

	�
l[�Ԁ�AA����������M�

�$0H`l�E�
4meshJO
AA�����������M�

�$0H`lM�
4meshԆ
���<� ��E�>@
+

	�
l[�Ԁ�AA����������M�

�$0H`lx�E�
rmeshJO
AA�����������M�

�$0H`lxM�
rmeshԆ
���<� ��E�>@
 


 


�
	l�
Ԁ;�
���<� ��E�>@
 



@@ -314,7 +314,7 @@
 


 


�
	l�dԀe���<� ��E�G@
 



-

	�
lseԀ#jAA����������T�

�$0H`l�M�
4meshj�AA����������;U�

�$0H`l�T�
4mesh�'	���<� ��E�H@
+

	�
lseԀ#jAA����������T�

�$0H`lx�M�
rmeshj�AA����������;U�

�$0H`lx�T�
rmesh�'	���<� ��E�H@
 


 


�
	l(	ԀW(	���<� ��E�H@
 



@@ -358,7 +358,7 @@
 


 


�
	l��Ԁ�����<0 ��E�Q@
 



-

	�
lS�Ԁ�AA��������@V\�

�$0H`l<U�
4meshJO
AA��������@��\�

�$0H`lV\�
4meshІ
���<P ��E�R@
+

	�
lS�Ԁ�AA��������@V\�

�$0H`lx<U�
rmeshJO
AA��������@��\�

�$0H`lxV\�
rmeshІ
���<P ��E�R@
 


 


�
	l��
Ԁ7�
���<P ��E�R@
 



@@ -398,7 +398,7 @@
 


 


�
	l�dԀe���<� ��E�[@
 



-

	�
lseԀ#jAA���������3�c�

�$0H`l�\�
4meshj�AA����������}d�

�$0H`l�c�
4mesh�'	���< ��E�\@
+

	�
lseԀ#jAA���������3�c�

�$0H`lx�\�
rmeshj�AA����������}d�

�$0H`lx�c�
rmesh�'	���< ��E�\@
 


 


�
	l(	ԀW(	���< ��E�\@
 



@@ -442,12 +442,12 @@
 


 


�
	l��Ԁ�����<� ��E�e@
 



-

	�
lS�Ԁ�AA���������S�k�

�$0H`l~d�
4meshJO
AA���������
-l�

�$0H`l�k�
4meshІ
���<� ��E�f@
+

	�
lS�Ԁ�AA���������S�k�

�$0H`lx~d�
rmeshJO
AA���������
+l�

�$0H`lx�k�
rmeshІ
���<� ��E�f@
 


 


�
	l��
Ԁ7�
���<� ��E�f@
 



-

	�
l��
ԀdJEEЀ������� D% 
�
�J??Ѐ<� E ��JԀ=K���<� ��E�g@
+

	�
l��
ԀdJEEЀ�������

�% 
�
�J??Ѐ<�

� ��JԀ=K���<� ��E�g@
 


 


�
	lMKԀ�K���<� ��E�g@
 



@@ -483,7 +483,7 @@
 


 


�
	l�dԀe���<P ��E�o@
 



-

	�
lseԀ#jAA��������`s9s�

�$0H`ll�
4meshj�AA��������`*�s�

�$0H`l9s�
4mesh�'	���<p ��E�p@
+

	�
lseԀ#jAA��������`s9s�

�$0H`lxl�
rmeshj�AA��������`*�s�

�$0H`lx9s�
rmesh�'	���<p ��E�p@
 


 


�
	l(	ԀW(	���<p ��E�p@
 



@@ -527,7 +527,7 @@
 


 


�
	l��Ԁ�����<	 ��E�y@
 



-

	�
lS�Ԁ�AA��������	��z�

�$0H`l�s�
4meshJO
AA��������	Ja{�

�$0H`l�z�
4meshІ
���< 	 ��E�z@
+

	�
lS�Ԁ�AA��������	��z�

�$0H`lx�s�
rmeshJO
AA��������	Ja{�

�$0H`lx�z�
rmeshІ
���< 	 ��E�z@
 


 


�
	l��
Ԁ7�
���< 	 ��E�z@
 



@@ -567,7 +567,7 @@
 


 


�
	l�dԀe���<�	 ��E��@
 



-

	�
lseԀ#jAA���������	�{��

�$0H`la{�
4meshj�AA���������	j��

�$0H`l|��
4mesh�'	���<�	 ��E��@
+

	�
lseԀ#jAA���������	�{��

�$0H`lxa{�
rmeshj�AA���������	j��

�$0H`lx|��
rmesh�'	���<�	 ��E��@
 


 


�
	l(	ԀW(	���<�	 ��E��@
 



@@ -626,8 +626,8 @@
  ��E��@
 



 

	�
l	S�Ԁ	�AA��������p
-���

�$0H`l��
4mesh	JO
AA��������p
-����

�$0H`l��
4mesh	І
���<�
+���

�$0H`lx��
rmesh	JO
AA��������p
+����

�$0H`lx��
rmesh	І
���<�
  ��E��@
 


 


�
	l	��
Ԁ	7�
���<�
@@ -683,7 +683,7 @@
 


 


�
	l	�dԀ	e���< ��E��@
 



-

	�
l	seԀ	#jAA�������� ��

�$0H`l���
4mesh	j�AA�������� �D��

�$0H`l���
4mesh	�'	���<0 ��E��@
+

	�
l	seԀ	#jAA�������� ��

�$0H`lx���
rmesh	j�AA�������� �D��

�$0H`lx���
rmesh	�'	���<0 ��E��@
 


 


�
	l	(	Ԁ	W(	���<0 ��E��@
 



@@ -720,13 +720,13 @@
 


�
	l	0Ԁ	����<� ��E��@
 



 

	�
l	�Ԁ
-JO
AA������������

�$0H`l���
4mesh
-�g22Ѐ<�J
4mesh7


-�h22Ј<�J
4mesh7


-ai22Ј<�J
4mesh7


-$j22Ј<�J
4mesh7


-�j22Ј<�J
4mesh7


-�k22Ј<�J
4mesh7


-[l22Ј<�J
4mesh7


-j�AA���������ꆡ�

�$0H`l���
4meshJ/
<<���������
-��

�$0H`l4meshj�<<���������*Ѱ�

�$0H`l4meshJ7
<<��������JR��

�$0H`l4meshj�<<��������j߿�

�$0H`l4mesh
J�<<�������� �H��

�$0H`l4mesh
j�<<��������0����

�$0H`l4meshJ�<<��������@ʒ��

�$0H`l4meshj�<<��������P�K��

�$0H`l4mesh
\ No newline at end of file
+JO
AA������������

�$0H`lx���
rmesh
+�g--Ѐ<�rmeshu

4
+�h--Ј<�rmeshu

4
+ai--Ј<�rmeshu

4
+ j--Ј<�rmeshu

4
+�j--Ј<�rmeshu

4
+�k--Ј<�rmeshu

4
+Sl--Ј<�rmeshu

4
+j�AA���������ꆡ�

�$0H`lx���
rmeshJ/
<<���������
+��

�$0H`lxrmeshj�<<���������*Ѱ�

�$0H`lxrmeshJ7
<<��������JR��

�$0H`lxrmeshj�<<��������j߿�

�$0H`lxrmesh
J�<<�������� �H��

�$0H`lxrmesh
j�<<��������0����

�$0H`lxrmeshJ�<<��������@ʒ��

�$0H`lxrmeshj�<<��������P�K��

�$0H`lxrmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-simplest-regression-test-1-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-simplest-regression-test-1-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-simplest-regression-test-1-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-simplest-regression-test-1-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,9 +1,9 @@
-��i��<<�����������

�$0H`l4mesh��RRЀ<J

�$0H`l4mesh3
������97
��Ԁ�PPЀ<
J

�$0H`l3
������97


��Ԁ��RRЀ< J

�$0H`l4mesh3
������97
��Ԁa�PPЀ<
J

�$0H`l3
������97


q�Ԁ�O
AA�������� JO
�

�$0H`l��
4mesh�iAA��������0�i�

�$0H`lO
�
4mesh��AA��������0j��

�$0H`lj�
4mesh
��AA��������@�
-�

�$0H`l��
4mesh
�O
AA��������@���

�$0H`l�
4mesh
�iAA��������P��

�$0H`l��
4mesh
��AA��������P�2�

�$0H`l��
4mesh(#LL�������������` 
��


+��i��<<�����������

�$0H`lxrmesh��>>Ѐ<

�$0H`lrmeshq


9u

��Ԁ��<<Ѐ<
�$0H`lq


9u

��Ԁ��>>Ѐ< 

�$0H`lrmeshq


9u

g�Ԁ��<<Ѐ<
�$0H`lq


9u


�Ԁ�O
AA�������� JO
�

�$0H`lx��
rmesh�iAA��������0�i�

�$0H`lxO
�
rmesh��AA��������0j��

�$0H`lxj�
rmesh
��AA��������@�
+�

�$0H`lx��
rmesh
�O
AA��������@���

�$0H`lx�
rmesh
�iAA��������P��

�$0H`lx��
rmesh
��AA��������P�2�

�$0H`lx��
rmesh(#LL�������������` 
��


 

������
 


S$LL�������������`
��


 

������
-


%EEЀ������p D% 
�
8%??Ѐ<p E ��%Ԁ�&LL�<� ��

+


%EEЀ������p

�% 
�
8%??Ѐ<p

� ��%Ԁ�&LL�<� ��

 



 

�&Ԁ
'���<� ��E�@
 


@@ -20,7 +20,7 @@
 


 


�
	l��Ԁ�����<� ��E�
@
 



-

	�
l��Ԁ��AA���������M�

�$0H`l3�
4mesh�O
AA������������

�$0H`lM�
4mesh��
���<� ��E�@
+

	�
l��Ԁ��AA���������M�

�$0H`lx3�
rmesh�O
AA������������

�$0H`lxM�
rmesh��
���<� ��E�@
 


 


�
	l��
Ԁ�
���<� ��E�@
 



@@ -62,7 +62,7 @@
 


 


�
	l`eԀ?f���<`
 ��E�@
 



-

	�
lOfԀ�iAA��������p
3�&�

�$0H`l��
4mesh��AA��������p
�t'�

�$0H`l�&�
4mesh�'	���<�
 ��E�@
+

	�
lOfԀ�iAA��������p
3�&�

�$0H`lx��
rmesh��AA��������p
�t'�

�$0H`lx�&�
rmesh�'	���<�
 ��E�@
 


 


�
	l�(	Ԁ�)	���<�
 ��E�@
 



@@ -106,8 +106,8 @@
 


 


�
	l�Ԁ�����< ��E�@
 



-

	�
l��Ԁ��AA�������� S�.�

�$0H`lu'�
4mesh�O
AA�������� 
-/�

�$0H`l�.�
4mesh��
���<0 ��E�@
+

	�
l��Ԁ��AA�������� S�.�

�$0H`lxu'�
rmesh�O
AA�������� 
+/�

�$0H`lx�.�
rmesh��
���<0 ��E�@
 


 


�
	lh�
Ԁ�
���<0 ��E�@
 



@@ -147,7 +147,7 @@
 


 


�
	leԀ�e���<� ��E�@
 



-

	�
l�eԀ�iAA���������s06�

�$0H`l/�
4mesh��AA���������*�6�

�$0H`l06�
4mesh�'	���<� ��E� @
+

	�
l�eԀ�iAA���������s06�

�$0H`lx/�
rmesh��AA���������*�6�

�$0H`lx06�
rmesh�'	���<� ��E� @
 


 


�
	l`(	Ԁ�(	���<� ��E� @
 



@@ -191,7 +191,7 @@
 


 


�
	l��ԀW����<p ��E�)@
 



-

	�
lg�Ԁ��AA�����������=�

�$0H`l�6�
4mesh�O
AA���������JX>�

�$0H`l�=�
4mesh��
���<� ��E�*@
+

	�
lg�Ԁ��AA�����������=�

�$0H`lx�6�
rmesh�O
AA���������JX>�

�$0H`lx�=�
rmesh��
���<� ��E�*@
 


 


�
	l,�
Ԁ��
���<� ��E�*@
 



@@ -231,7 +231,7 @@
 


 


�
	l�dԀOe���<  ��E�3@
 



-

	�
l_eԀ�iAA��������0�rE�

�$0H`lX>�
4mesh��AA��������0j�E�

�$0H`lsE�
4mesh�'	���<@ ��E�4@
+

	�
l_eԀ�iAA��������0�rE�

�$0H`lxX>�
rmesh��AA��������0j�E�

�$0H`lxsE�
rmesh�'	���<@ ��E�4@
 


 


�
	l8(	Ԁ�(	���<@ ��E�4@
 



@@ -275,7 +275,7 @@
 


 


�
	l��Ԁ����<� ��E�=@
 



-

	�
l/�Ԁ��AA����������M�

�$0H`l�E�
4mesh�O
AA�����������M�

�$0H`lM�
4mesh��
���<� ��E�>@
+

	�
l/�Ԁ��AA����������M�

�$0H`lx�E�
rmesh�O
AA�����������M�

�$0H`lxM�
rmesh��
���<� ��E�>@
 


 


�
	l�
Ԁo�
���<� ��E�>@
 



@@ -315,7 +315,7 @@
 


 


�
	l�dԀ7e���<� ��E�G@
 



-

	�
lGeԀ�iAA����������T�

�$0H`l�M�
4mesh��AA����������;U�

�$0H`l�T�
4mesh�'	���<� ��E�H@
+

	�
lGeԀ�iAA����������T�

�$0H`lx�M�
rmesh��AA����������;U�

�$0H`lx�T�
rmesh�'	���<� ��E�H@
 


 


�
	l,(	Ԁ�(	���<� ��E�H@
 



@@ -359,7 +359,7 @@
 


 


�
	l��Ԁ����<0 ��E�Q@
 



-

	�
l'�Ԁ��AA��������@V\�

�$0H`l<U�
4mesh�O
AA��������@��\�

�$0H`lV\�
4mesh��
���<P ��E�R@
+

	�
l'�Ԁ��AA��������@V\�

�$0H`lx<U�
rmesh�O
AA��������@��\�

�$0H`lxV\�
rmesh��
���<P ��E�R@
 


 


�
	l�
Ԁg�
���<P ��E�R@
 



@@ -399,7 +399,7 @@
 


 


�
	l�dԀ7e���<� ��E�[@
 



-

	�
lGeԀ�iAA���������3�c�

�$0H`l�\�
4mesh��AA����������}d�

�$0H`l�c�
4mesh�'	���< ��E�\@
+

	�
lGeԀ�iAA���������3�c�

�$0H`lx�\�
rmesh��AA����������}d�

�$0H`lx�c�
rmesh�'	���< ��E�\@
 


 


�
	l,(	Ԁ�(	���< ��E�\@
 



@@ -443,12 +443,12 @@
 


 


�
	l��Ԁ����<� ��E�e@
 



-

	�
l'�Ԁ��AA���������S�k�

�$0H`l~d�
4mesh�O
AA���������
-l�

�$0H`l�k�
4mesh��
���<� ��E�f@
+

	�
l'�Ԁ��AA���������S�k�

�$0H`lx~d�
rmesh�O
AA���������
+l�

�$0H`lx�k�
rmesh��
���<� ��E�f@
 


 


�
	l�
Ԁg�
���<� ��E�f@
 



-

	�
lw�
Ԁ�IEEЀ������� D% 
�
�J??Ѐ<� E ��JԀ
K���<� ��E�g@
+

	�
lw�
Ԁ�IEEЀ�������

�% 
�
�J??Ѐ<�

� ��JԀ
K���<� ��E�g@
 


 


�
	lyKԀ�K���<� ��E�g@
 



@@ -484,7 +484,7 @@
 


 


�
	l�dԀ7e���<P ��E�o@
 



-

	�
lGeԀ�iAA��������`s9s�

�$0H`ll�
4mesh��AA��������`*�s�

�$0H`l9s�
4mesh�'	���<p ��E�p@
+

	�
lGeԀ�iAA��������`s9s�

�$0H`lxl�
rmesh��AA��������`*�s�

�$0H`lx9s�
rmesh�'	���<p ��E�p@
 


 


�
	l,(	Ԁ�(	���<p ��E�p@
 



@@ -528,7 +528,7 @@
 


 


�
	l��Ԁ����<	 ��E�y@
 



-

	�
l'�Ԁ��AA��������	��z�

�$0H`l�s�
4mesh�O
AA��������	Ja{�

�$0H`l�z�
4mesh��
���< 	 ��E�z@
+

	�
l'�Ԁ��AA��������	��z�

�$0H`lx�s�
rmesh�O
AA��������	Ja{�

�$0H`lx�z�
rmesh��
���< 	 ��E�z@
 


 


�
	l�
Ԁg�
���< 	 ��E�z@
 



@@ -568,7 +568,7 @@
 


 


�
	l�dԀ7e���<�	 ��E��@
 



-

	�
lGeԀ�iAA���������	�{��

�$0H`la{�
4mesh��AA���������	j��

�$0H`l|��
4mesh�'	���<�	 ��E��@
+

	�
lGeԀ�iAA���������	�{��

�$0H`lxa{�
rmesh��AA���������	j��

�$0H`lx|��
rmesh�'	���<�	 ��E��@
 


 


�
	l,(	Ԁ�(	���<�	 ��E��@
 



@@ -627,8 +627,8 @@
  ��E��@
 



 

	�
l	'�Ԁ	��AA��������p
-���

�$0H`l��
4mesh	�O
AA��������p
-����

�$0H`l��
4mesh	��
���<�
+���

�$0H`lx��
rmesh	�O
AA��������p
+����

�$0H`lx��
rmesh	��
���<�
  ��E��@
 


 


�
	l	�
Ԁ	g�
���<�
@@ -684,7 +684,7 @@
 


 


�
	l	�dԀ	7e���< ��E��@
 



-

	�
l	GeԀ	�iAA�������� ��

�$0H`l���
4mesh	��AA�������� �D��

�$0H`l���
4mesh	�'	���<0 ��E��@
+

	�
l	GeԀ	�iAA�������� ��

�$0H`lx���
rmesh	��AA�������� �D��

�$0H`lx���
rmesh	�'	���<0 ��E��@
 


 


�
	l	,(	Ԁ	�(	���<0 ��E��@
 



@@ -751,7 +751,7 @@
 "����<� ��E��@
 


 


�
	l
-��AA���������_��

�$0H`lE��
4mesh
+��AA���������_��

�$0H`lxE��
rmesh
 ����<� ��E��@
 


 


�
	l
@@ -764,15 +764,15 @@
 K����<� ��E��@
 


 


�
	l
-l�22Ѐ<�J
4mesh7


-k�22Ј<�J
4mesh7


-j�22Ј<�J
4mesh7


-N�22Ј<�J
4mesh7


-D�22Ј<�J
4mesh7


-�22Ј<�J
4mesh7


-�22Ј<�J
4mesh7


-��
EEЀ������� D% �

-��EEЀ������ D% �

-�a<<��������3���

�$0H`l4mesh
-�EEЀ������  D% �
��<<��������0Sm��

�$0H`l4mesh�a<<��������@s:��

�$0H`l4mesh`DEEЀ������P D% �
��<<��������`���

�$0H`l4mesh�u<<��������p����

�$0H`l4mesh5EEЀ������� D% �

�EEЀ������� D% 	�

��<<����������Y��

�$0H`l4mesh
��<<������������

�$0H`l4mesh
�r	EEЀ������� D% 
-�
��<<������������

�$0H`l4mesh��EEЀ������� D% 	�
�u<<���������3��

�$0H`l4mesh
\ No newline at end of file
+l�--Ѐ<�rmeshu

4
+c�--Ј<�rmeshu

4
+Z�--Ј<�rmeshu

4
+6�--Ј<�rmeshu

4
+$�--Ј<�rmeshu

4
+��--Ј<�rmeshu

4
+��--Ј<�rmeshu

4
+��
EEЀ�������

�% �

+��EEЀ������

�% �

+�a<<��������3���

�$0H`lxrmesh
+�EEЀ������ 

�% �
��<<��������0Sm��

�$0H`lxrmesh�a<<��������@s:��

�$0H`lxrmesh`DEEЀ������P

�% �
��<<��������`���

�$0H`lxrmesh�u<<��������p����

�$0H`lxrmesh5EEЀ�������

�% �

�EEЀ�������

�% 	�

��<<����������Y��

�$0H`lxrmesh
��<<������������

�$0H`lxrmesh
�r	EEЀ�������

�% 
+�
��<<������������

�$0H`lxrmesh��EEЀ�������

�% 	�
�u<<���������3��

�$0H`lxrmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-target-flags-regression-test-0-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-target-flags-regression-test-0-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-target-flags-regression-test-0-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-target-flags-regression-test-0-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,11 +1,11 @@
-�ò���iB�RRЀ<J

�$0H`l4mesh3
������97
a�ԀH�Ԁ�PPЀ<
J

�$0H`l3
������97

�AA�������� ���

�$0H`l��
4mesh%�RRЀ<J

�$0H`l4mesh3
������97
��Ԁ��PPЀ<0
J


�$0H`l3
������97

��Ԁ��RRЀ<@J

�$0H`l4mesh3
������97��Ԁ��PPЀ<
J

�$0H`l3
������97

��ԀJO
AA�������� JO
�

�$0H`l��
4mesh+bFF��������P�a�

�$0H`l
-7�

O
�
4meshj�AA��������0j��

�$0H`lb�
4mesh
�FF��������`��

�$0H`l
-��

��
4mesh
JO
AA��������@���

�$0H`l�
4mesh
+bFF��������p��

�$0H`l
-z�

��
4mesh
j�AA��������P�2�

�$0H`l��
4mesh�LL��������������
��


+�ò���i&�>>Ѐ<

�$0H`lrmeshq


9u

)�Ԁ��Ԁ��<<Ѐ<
�$0H`lq


9u
�AA�������� ���

�$0H`lx��
rmesh%�>>Ѐ<

�$0H`lrmeshq


9u

��ԀX�<<Ѐ<0

�$0H`lq


9u
h�Ԁ>�>>Ѐ<@

�$0H`lrmeshq


9u
N�Ԁ��<<Ѐ<
�$0H`lq


9u
@�ԀJO
AA�������� JO
�

�$0H`lx��
rmesh+bFF��������P�a�

�$0H`lx
+7�

O
�
rmeshj�AA��������0j��

�$0H`lxb�
rmesh
�FF��������`��

�$0H`lx
+��

��
rmesh
JO
AA��������@���

�$0H`lx�
rmesh
+bFF��������p��

�$0H`lx
+z�

��
rmesh
j�AA��������P�2�

�$0H`lx��
rmesh�LL��������������
��


 

������
 


�LL�������������`
��


 

������
-


�EEЀ������p D% 
�
�EEЀ������� D%

��
�Ԁ=??Ѐ<� E
��MԀ�LL�<� ��

+


�EEЀ������p

�% 
�
�EEЀ�������

�%

��
�Ԁ=??Ѐ<�

�
��MԀ�LL�<� ��

 



 

aԀLL�<���

 



@@ -21,30 +21,28 @@
 



 

	�
l�"Ԁ�#���<���E�@
 



-

	�
l�FF��������
E�

�$0H`l
-�

3�
4meshJO
AA������������

�$0H`lE�
4mesh�0LL�������������
 
��


+

	�
l�FF��������
E�

�$0H`lx
+�

3�
rmeshJO
AA������������

�$0H`lxE�
rmesh�0LL�������������
 
��


 

������
 


1LL�<� ��

 



-

 3LL�<� ��

-



-

�3Ԁ5���< 
 ��E�@
-


-


�
	l5Ԁ�5LL��������������
��


+

�1Ԁ�2LL��������������
��


 

������
-


�8LL�������������� ��


+


p4���< 
 ��E�@
+


+


�
	l�4ԀX8LL�������������� ��


 


������
-

:LL�<0
 ��

+

�9LL�<0
 ��

 


-


/:ԀF;LL�������������@
��


+


�9Ԁ�:LL�������������@
��


 


������
-

7<���<� ��E�@
+

�;���<� ��E�@
 



-

	�
lx=ԀgLL�������������
 ��


+

	�
l�<ԀgLL�������������
 ��


 


������
 

�LL�������������P
��


 


������
-

O$Ԁ�%EEЀ������`
 D%
�,

�%??Ѐ<
 E ��&Ԁ.'??Ѐ<p
 E
���(LL�<�
��

+

O$Ԁ�%EEЀ������`


�%
�,

�%??Ѐ<


� ��&Ԁ.'??Ѐ<p


�
���(LL�<�
��

 


 


�(ԀQ)���< 
 ��E�@
 



@@ -58,46 +56,46 @@
 



 

M1Ԁ2LL�<�
��

 



-

�2LL�������������@

��


+

�2LL�������������@

��


 

������
 


J7Ԁy8���<�
��E�@
 


 



-�
l�8Ԁ+bFF���������
3�&�

�$0H`l
-�&�

��
4meshj�AA��������P
�t'�

�$0H`l�&�
4mesh@
Ԁo���<�
��E�
@
+�
l�8Ԁ+bFF���������
3�&�

�$0H`lx
+�&�

��
rmeshj�AA��������P
�t'�

�$0H`lx�&�
rmesh@
Ԁo���<�
��E�
@
 


 


�
	lԀ����<`
 ��E�
@
 



 

	�
lԀ����<�
��E�
@
 



-

	�
l�FF��������S�.�

�$0H`l
-].�

u'�
4meshJO
AA��������p

-/�

�$0H`l�.�
4mesh�
���< ��E�
@
+

	�
l�FF��������S�.�

�$0H`lx
+].�

u'�
rmeshJO
AA��������p

+/�

�$0H`lx�.�
rmesh�
���< ��E�
@
 


 


�
	lԀ[���<�
 ��E�
@
 



-

	�
l�Ԁ���<�
 ��E�
@
+

	�
lKԀ���<�
 ��E�
@
 



 

�

-l�Ԁ����< ��E�
@
+lpԀ����< ��E�
@
 



 

�

-l!Ԁ�"���<0��E�
@
+l/!ԀV"���<0��E�
@
 


 



-�
l�"Ԁ+bFF��������@s(6�

�$0H`l
-�5�

/�
4meshj�AA���������
*�6�

�$0H`l(6�
4mesh@
Ԁ���<P��E�@
+�
lf"Ԁ+bFF��������@s(6�

�$0H`lx
+�5�

/�
rmeshj�AA���������
*�6�

�$0H`lx(6�
rmesh@
Ԁ���<P��E�@
 


 


�
	l/Ԁ����<�
 ��E�@
 



-

	�
l�Ԁ���<`��E�@
+

	�
lwԀ����<`��E�@
 



-

	�
l�FF��������p��=�

�$0H`l
-�=�

�6�
4meshJO
AA���������
JX>�

�$0H`l�=�
4mesh�
���<� ��E�@
+

	�
l�FF��������p��=�

�$0H`lx
+�=�

�6�
rmeshJO
AA���������
JX>�

�$0H`lx�=�
rmesh�
���<� ��E�@
 


 


�
	lԀ[���<�
 ��E�@
 



-

	�
l�Ԁ���<�
 ��E�@
+

	�
lKԀ���<�
 ��E�@
 



 

�

 lpԀO���<���E�@
@@ -106,5 +104,5 @@
 l� Ԁ�!���<���E�@
 


 



-�
l�!Ԁ+bFF����������jE�

�$0H`l
-@E�

X>�
4meshj�AA���������
j�E�

�$0H`lkE�
4mesh
\ No newline at end of file
+�
l�!Ԁ+bFF����������jE�

�$0H`lx
+@E�

X>�
rmeshj�AA���������
j�E�

�$0H`lxkE�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-target-flags-regression-test-1-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-target-flags-regression-test-1-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-target-flags-regression-test-1-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-target-flags-regression-test-1-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,16 +1,16 @@
-�ò���i%RRЀ<J

�$0H`l4mesh3
������97
>&Ԁ7'Ԁ�'PPЀ<
J

�$0H`l3
������97


��AA�������� (��

�$0H`l$�
4mesh��RRЀ<J

�$0H`l4mesh3
������97
�Ԁ%�PPЀ<0
J


�$0H`l3
������97

5�Ԁ�RRЀ<@J

�$0H`l4mesh3
������97�Ԁ{�PPЀ<
J

�$0H`l3
������97

<�Ԁ��AA�������� ���

�$0H`l��
4mesh��RRЀ<J

�$0H`l4mesh3
������97
��Ԁ�PPЀ<0
J


�$0H`l3
������97

��Ԁ	�RRЀ<@J

�$0H`l4mesh3
������97��Ԁt�PPЀ<
J

�$0H`l3
������97

��Ԁ�O
AA�������� JO
�

�$0H`l��
4mesh�7FF��������PH7�

�$0H`l
-��

��
4mesh�aFF��������P�a�

�$0H`l
-7�

O
�
4mesh��AA��������0j��

�$0H`lb�
4mesh
��FF��������`h��

�$0H`l
-f�

b�
4mesh
��FF��������`��

�$0H`l
-��

��
4mesh
�O
AA��������@���

�$0H`l�
4mesh
�7FF��������p�y�

�$0H`l
-�

�
4mesh
�aFF��������p��

�$0H`l
-z�

��
4mesh
��AA��������P�2�

�$0H`l��
4meshLL�������������� 
��


+�ò���i%>>Ѐ<

�$0H`lrmeshq


9u

&Ԁ�&Ԁv'<<Ѐ<
�$0H`lq


9u

��AA�������� (��

�$0H`lx$�
rmesh��>>Ѐ<

�$0H`lrmeshq


9u

c�Ԁ�<<Ѐ<0

�$0H`lq


9u
��Ԁ��>>Ѐ<@

�$0H`lrmeshq


9u
ǘԀ'�<<Ѐ<
�$0H`lq


9u
̙Ԁ��AA�������� ���

�$0H`lx��
rmesh��>>Ѐ<

�$0H`lrmeshq


9u

��Ԁ��<<Ѐ<0

�$0H`lq


9u
��Ԁ��>>Ѐ<@

�$0H`lrmeshq


9u
z�Ԁ�<<Ѐ<
�$0H`lq


9u
�Ԁ�O
AA�������� JO
�

�$0H`lx��
rmesh�7FF��������PH7�

�$0H`lx
+��

��
rmesh�aFF��������P�a�

�$0H`lx
+7�

O
�
rmesh��AA��������0j��

�$0H`lxb�
rmesh
��FF��������`h��

�$0H`lx
+f�

b�
rmesh
��FF��������`��

�$0H`lx
+��

��
rmesh
�O
AA��������@���

�$0H`lx�
rmesh
�7FF��������p�y�

�$0H`lx
+�

�
rmesh
�aFF��������p��

�$0H`lx
+z�

��
rmesh
��AA��������P�2�

�$0H`lx��
rmeshLL�������������� 
��


 

������
 


3LL��������������
��


 

������
 


^LL�������������`
��


 

������
-


!EEЀ������p D% 
�
pEEЀ������� D%

��
s??Ѐ<� E ��Ԁ�??Ѐ<� E
��zԀ%LL�<� ��

+


!EEЀ������p

�% 
�
pEEЀ�������

�%

��
s??Ѐ<�

� ��Ԁ�??Ѐ<�

�
��zԀ%LL�<� ��

 



 

5Ԁ�LL�<���

 



@@ -32,35 +32,35 @@
 



 

	�
l�#Ԁ:%LL��������������
��


 


������
-

��FF�����������

�$0H`l
-��

��
4mesh��FF��������
E�

�$0H`l
-�

3�
4mesh�O
AA������������

�$0H`lE�
4meshh0LL�������������
 
��


+

��FF�����������

�$0H`lx
+��

��
rmesh��FF��������
E�

�$0H`lx
+�

3�
rmesh�O
AA������������

�$0H`lxE�
rmeshh0LL�������������
 
��


 

������
-


�3LL�<� ��

+


�1LL�<� ��

 



-

�3Ԁ4���< 
 ��E�@
-


-


�
	lH5Ԁ;6LL��������������
��


+

�1Ԁ3LL��������������
��


 

������
-


t9LL�������������� ��


+


l3���< 
 ��E�@
+


+


�
	l�4Ԁ�8LL�������������� ��


 


������
-

�9LL�<0
 ��

+

9LL�<0
 ��

 


-


[:Ԁ�:LL�������������@
��


+


�9Ԁ*:LL�������������@
��


 


������
-

�;LL����������������


+

V;LL����������������


 


������
-

<=���<� ��E�@
+

�<���<� ��E�@
 



-

	�
lL=Ԁ�LL�������������
 ��


+

	�
l�<Ԁ�LL�������������
 ��


 


������
 

LL�������������P
��


 


������
 

> LL�������������
��


 


������
-

;"??Ѐ<
 E ,
_#Ԁ$LL�< 
��

+

;"??Ѐ<


� ,
_#Ԁ$LL�< 
��

 


-


#$Ԁ%EEЀ������0
 D%

��
a%EEЀ������`
 D%
�,

d&??Ѐ<
 E �t&Ԁ�&??Ѐ<p
 E
��k'Ԁ�'??Ѐ<@
 E�,
i(LL�<�
��

+


#$Ԁ%EEЀ������0


�%

��
a%EEЀ������`


�%
�,

d&??Ѐ<


� �t&Ԁ�&??Ѐ<p


�
��k'Ԁ�'??Ѐ<@


��,
i(LL�<�
��

 


 


&)ԀU*���< 
 ��E�@
 



@@ -79,7 +79,7 @@
 



 

!1Ԁ�1LL�<�
��

 



-

P2Ԁ3LL�������������@

��


+

P2Ԁ3LL�������������@

��


 

������
 


�3LL�<p
��

 



@@ -89,9 +89,9 @@
 �
l7Ԁu7���<�
��E�@
 


 



-�
l�8Ԁ�7FF���������
Ȼ&�

�$0H`l
-J&�

E�
4mesh�aFF���������
3�&�

�$0H`l
-�&�

��
4mesh��AA��������P
�t'�

�$0H`l�&�
4mesh
���<�
 ��E�
@
+�
l�8Ԁ�7FF���������
Ȼ&�

�$0H`lx
+J&�

E�
rmesh�aFF���������
3�&�

�$0H`lx
+�&�

��
rmesh��AA��������P
�t'�

�$0H`lx�&�
rmesh
���<�
 ��E�
@
 


 


�
	l
Ԁk
���<�
��E�
@
 


@@ -99,45 +99,46 @@
 



 

	�
l�Ԁ����<�
��E�
@
 



-

	�
l	Ԁ��FF���������
�\.�

�$0H`l
-�-�

�&�
4mesh��FF��������S�.�

�$0H`l
-].�

u'�
4mesh�O
AA��������p

-/�

�$0H`l�.�
4mesh@
���< ��E�
@
+

	�
l	Ԁ��FF���������
�\.�

�$0H`lx
+�-�

�&�
rmesh��FF��������S�.�

�$0H`lx
+].�

u'�
rmesh�O
AA��������p

+/�

�$0H`lx�.�
rmesh@
���< ��E�
@
 


-


�
	l0Ԁ_���<�
 ��E�
@
+


�
	l0Ԁ���<�
 ��E�
@
 



-

	�
loԀ����<�
 ��E�
@
+

	�
lԀ4���<�
 ��E�
@
 



 

�

-l�Ԁ����< ��E�
@
+lDԀ����< ��E�
@
 



 

�

-l+ԀZ���<�
��E�
@
+l�Ԁ
+���<�
��E�
@
 



 

�

-l ԀC!���<�
��E�
@
+l�Ԁ� ���<�
��E�
@
 


 



-�
lS!Ԁ�!���<0��E�
@
+�
l!Ԁ�!���<0��E�
@
 


 



-�
l�"Ԁ�7FF���������
�5�

�$0H`l
-�5�

�.�
4mesh�aFF��������@s(6�

�$0H`l
-�5�

/�
4mesh��AA���������
*�6�

�$0H`l(6�
4mesh
���<�
 ��E�@
+�
l�"Ԁ�7FF���������
�5�

�$0H`lx
+�5�

�.�
rmesh�aFF��������@s(6�

�$0H`lx
+�5�

/�
rmesh��AA���������
*�6�

�$0H`lx(6�
rmesh
���<�
 ��E�@
 


 


�
	l
Ԁk
���<P��E�@
 


-


�
	l[Ԁ����<�
 ��E�@
+


�
	l[Ԁ:���<�
 ��E�@
 



-

	�
l�Ԁ���<`��E�@
+

	�
lJԀ����<`��E�@
 



-

	�
lVԀ��FF��������(�=�

�$0H`l
--=�

(6�
4mesh��FF��������p��=�

�$0H`l
-�=�

�6�
4mesh�O
AA���������
JX>�

�$0H`l�=�
4mesh@
���<� ��E�@
+

	�
lԀ��FF��������(�=�

�$0H`lx
+-=�

(6�
rmesh��FF��������p��=�

�$0H`lx
+�=�

�6�
rmesh�O
AA���������
JX>�

�$0H`lx�=�
rmesh@
���<� ��E�@
 


-


�
	l0Ԁ_���<�
 ��E�@
+


�
	l0Ԁ���<�
 ��E�@
 



-

	�
loԀ4���<�
 ��E�@
+

	�
lԀ4���<�
 ��E�@
 



 

�

 lDԀ����<���E�@
@@ -152,6 +153,6 @@
 �
lc Ԁ!���<���E�@
 


 



-�
l�!Ԁ�7FF��������0H@E�

�$0H`l
-�D�

�=�
4mesh�aFF����������jE�

�$0H`l
-@E�

X>�
4mesh��AA���������
j�E�

�$0H`lkE�
4mesh
\ No newline at end of file
+�
l�!Ԁ�7FF��������0H@E�

�$0H`lx
+�D�

�=�
rmesh�aFF����������jE�

�$0H`lx
+@E�

X>�
rmesh��AA���������
j�E�

�$0H`lxkE�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-target-flags-regression-test-2-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-target-flags-regression-test-2-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-target-flags-regression-test-2-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-target-flags-regression-test-2-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,15 +1,14 @@
-��iu$<<��������
$�

�$0H`l4mesh�$RRЀ<J

�$0H`l4mesh3
������97
\%Ԁ&PPЀ<
J

�$0H`l3
������97


&Ԁ�&RRЀ< J

�$0H`l4mesh3
������97

-'Ԁa'PPЀ<
J

�$0H`l3
������97


"(Ԁ(�AA�������� (��

�$0H`l$�
4meshB�RRЀ<J

�$0H`l4mesh3
������97
R�Ԁ��PPЀ<0
J


�$0H`l3
������97

a�Ԁ��RRЀ<@J

�$0H`l4mesh3
������97H�Ԁ�PPЀ<
J

�$0H`l3
������97

�Ԁ�AA�������� ���

�$0H`l��
4mesh��Ԁ��PPЀ<0
J


�$0H`l3
������97

��RRЀ<@J

�$0H`l4mesh3
������97��Ԁ��AA��������0-��

�$0H`l��
4meshH7FF��������PH7�

�$0H`l
-��

��
4mesh+bFF��������P�a�

�$0H`l
-7�

O
�
4mesh
}$AA��������@Mf�

�$0H`l7�
4mesh
(�FF��������`h��

�$0H`l
-f�

b�
4mesh
�FF��������`��

�$0H`l
-��

��
4mesh
��AA��������Pm�

�$0H`l��
4mesh
H7FF��������p�y�

�$0H`l
-�

�
4mesh
+bFF��������p��

�$0H`l
-z�

��
4mesh�LL�������������� 
��


+��iu$<<��������
$�

�$0H`lxrmesh�$>>Ѐ<

�$0H`lrmeshq


9u

@%Ԁ�%<<Ѐ<
�$0H`lq


9u

�%Ԁ�&>>Ѐ< 

�$0H`lrmeshq


9u

�&Ԁ
'<<Ѐ<
�$0H`lq


9u

�'Ԁ(�AA�������� (��

�$0H`lx$�
rmesh&�>>Ѐ<

�$0H`lrmeshq


9u

6�Ԁ��<<Ѐ<0

�$0H`lq


9u
)�ԀK�>>Ѐ<@

�$0H`lrmeshq


9u
��Ԁ��<<Ѐ<
�$0H`lq


9u
��Ԁ�AA�������� ���

�$0H`lx��
rmesh��ԀX�<<Ѐ<0

�$0H`lq


9u
>�>>Ѐ<@

�$0H`lrmeshq


9u
@�Ԁ��AA��������0-��

�$0H`lx��
rmeshH7FF��������PH7�

�$0H`lx
+��

��
rmesh+bFF��������P�a�

�$0H`lx
+7�

O
�
rmesh
}$AA��������@Mf�

�$0H`lx7�
rmesh
(�FF��������`h��

�$0H`lx
+f�

b�
rmesh
�FF��������`��

�$0H`lx
+��

��
rmesh
��AA��������Pm�

�$0H`lx��
rmesh
H7FF��������p�y�

�$0H`lx
+�

�
rmesh
+bFF��������p��

�$0H`lx
+z�

��
rmesh�LL�������������� 
��


 

������
 


�LL��������������
��


 

������
-


�EEЀ������� D%

��
??Ѐ<� E ��Ԁ=??Ѐ<� E
��aԀLL�<���

+


�EEЀ�������

�%

��
??Ѐ<�

� ��Ԁ=??Ѐ<�

�
��aԀLL�<���

 



 

Ԁ����<� ��E�@
 


@@ -23,39 +22,39 @@
 


 


�"Ԁ�#���<���E�@
 



-

	�
l�#Ԁ}$AA��������p���

�$0H`lz�
4mesh�$LL��������������
��


+

	�
l�#Ԁ}$AA��������p���

�$0H`lxz�
rmesh�$LL��������������
��


 


������
 

�%LL��������������
��


 


������
-

(�FF�����������

�$0H`l
-��

��
4mesh�FF��������
E�

�$0H`l
-�

3�
4mesh�0LL�������������
 
��


+

(�FF�����������

�$0H`lx
+��

��
rmesh�FF��������
E�

�$0H`lx
+�

3�
rmesh�0LL�������������
 
��


 

������
 


1LL��������������
��


 

������
-


>2LL��������������
��


+


�1Ԁ{2LL��������������
��


 

������
-


�3Ԁ5���< 
 ��E�@
+


p4���< 
 ��E�@
 


-


�
	l:LL�<0
 ��

+


�
	l�9LL�<0
 ��

 


-


F;LL�������������@
��


+


�:LL�������������@
��


 


������
-

q;LL����������������


+

�:LL����������������


 


������
-

�<LL����������������


+


<LL����������������


 


������
-

x=Ԁ�LL�������������P
��


+

�<Ԁ�LL�������������P
��


 


������
 

�LL�������������
��


 


������
 

� LL����������������


 


������
-

�!EEЀ������� D% 
�
�!??Ѐ<
 E ,
w"Ԁ"#LL�<� ��

+

�!EEЀ�������

�% 
�
�!??Ѐ<


� ,
w"Ԁ"#LL�<� ��

 


 


2#Ԁ�#LL�< 
��

 


-


O$Ԁ�$EEЀ������0
 D%

��
�%EEЀ������`
 D%
�,

�&Ԁ.'??Ѐ<p
 E
��>'Ԁ�'??Ѐ<@
 E�,
5(Ԁ�(LL�<�
��

+


O$Ԁ�$EEЀ������0


�%

��
�%EEЀ������`


�%
�,

�&Ԁ.'??Ѐ<p


�
��>'Ԁ�'??Ѐ<@


��,
5(Ԁ�(LL�<�
��

 


 


�*Ԁ>,���<�
��E�@
 



@@ -82,46 +81,46 @@
 �
lJ7Ԁy8���<�
��E�@
 


 



-�
l��AA��������
�I&�

�$0H`l�
4meshH7FF���������
Ȼ&�

�$0H`l
-J&�

E�
4mesh+bFF���������
3�&�

�$0H`l
-�&�

��
4mesh���<�
 ��E�
@
+�
l��AA��������
�I&�

�$0H`lx�
rmeshH7FF���������
Ȼ&�

�$0H`lx
+J&�

E�
rmesh+bFF���������
3�&�

�$0H`lx
+�&�

��
rmesh���<�
 ��E�
@
 


 


�
	l@
Ԁo���<�
��E�
@
 


 


�
	lԀ����<�
��E�
@
 



-

	�
l�Ԁ}$AA��������
��-�

�$0H`l�&�
4mesh(�FF���������
�\.�

�$0H`l
-�-�

�&�
4mesh�FF��������S�.�

�$0H`l
-].�

u'�
4mesh�
���< ��E�
@
+

	�
l�Ԁ}$AA��������
��-�

�$0H`lx�&�
rmesh(�FF���������
�\.�

�$0H`lx
+�-�

�&�
rmesh�FF��������S�.�

�$0H`lx
+].�

u'�
rmesh�
���< ��E�
@
 


-


�
	l�Ԁ�Ԁ����< ��E�
@
+


�
	lKԀpԀ����< ��E�
@
 



 

�

-l�ԀV���<�
��E�
@
+l�Ԁ���<�
��E�
@
 



 

�

-l�Ԁ����< 
 ��E�
@
+lGԀv���< 
 ��E�
@
 


 



-�
l�Ԁ? ���<�
��E�
@
+�
l�Ԁ����<�
��E�
@
 


 



-�
l!Ԁ�"���<0��E�
@
+�
l/!ԀV"���<0��E�
@
 


 



-�
l��AA��������0
�5�

�$0H`l].�
4meshH7FF���������
�5�

�$0H`l
-�5�

�.�
4mesh+bFF��������@s(6�

�$0H`l
-�5�

/�
4mesh���<�
 ��E�@
+�
l��AA��������0
�5�

�$0H`lx].�
rmeshH7FF���������
�5�

�$0H`lx
+�5�

�.�
rmesh+bFF��������@s(6�

�$0H`lx
+�5�

/�
rmesh���<�
 ��E�@
 


 


�
	l@
Ԁ���<P��E�@
 


-


�
	l�Ԁ���<`��E�@
+


�
	lwԀ����<`��E�@
 



-

	�
l*Ԁ}$AA��������@

-=�

�$0H`l�5�
4mesh(�FF��������(�=�

�$0H`l
--=�

(6�
4mesh�FF��������p��=�

�$0H`l
-�=�

�6�
4mesh�
���<� ��E�@
+

	�
l�Ԁ}$AA��������@

-=�

�$0H`lx�5�
rmesh(�FF��������(�=�

�$0H`lx
+-=�

(6�
rmesh�FF��������p��=�

�$0H`lx
+�=�

�6�
rmesh�
���<� ��E�@
 


-


�
	l�ԀpԀO���<���E�@
+


�
	lKԀpԀO���<���E�@
 



 

�

 l_Ԁ����<��E�@
@@ -136,6 +135,6 @@
 �
l� Ԁ�!���<���E�@
 


 



-�
l��AA��������`
-�D�

�$0H`l�=�
4meshH7FF��������0H@E�

�$0H`l
-�D�

�=�
4mesh+bFF����������jE�

�$0H`l
-@E�

X>�
4mesh
\ No newline at end of file
+�
l��AA��������`
-�D�

�$0H`lx�=�
rmeshH7FF��������0H@E�

�$0H`lx
+�D�

�=�
rmesh+bFF����������jE�

�$0H`lx
+@E�

X>�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/hwmp-target-flags-regression-test-3-1.pcap ns-3.23/src/mesh/test/dot11s/hwmp-target-flags-regression-test-3-1.pcap
--- ns-3.22/src/mesh/test/dot11s/hwmp-target-flags-regression-test-3-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/hwmp-target-flags-regression-test-3-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,36 +1,36 @@
-��i
$<<��������
$�

�$0H`l4mesh%RRЀ<J

�$0H`l4mesh3
������97
/%Ԁ}%PPЀ<
J

�$0H`l3
������97


>&Ԁr&RRЀ< J

�$0H`l4mesh3
������97
7'Ԁ�'PPЀ<
J

�$0H`l3
������97


�'Ԁ��AA�������� (��

�$0H`l$�
4mesh�Ԁ%�PPЀ<0
J


�$0H`l3
������97

�RRЀ<@J

�$0H`l4mesh3
������97<�Ԁ-�AA��������0-��

�$0H`l��
4mesh�7FF��������PH7�

�$0H`l
-��

��
4mesh

$AA��������@Mf�

�$0H`l7�
4mesh
��FF��������`h��

�$0H`l
-f�

b�
4mesh
-�AA��������Pm�

�$0H`l��
4mesh
�7FF��������p�y�

�$0H`l
-�

�
4meshLL�������������� 
��


+��i
$<<��������
$�

�$0H`lxrmesh%>>Ѐ<

�$0H`lrmeshq


9u

%Ԁa%<<Ѐ<
�$0H`lq


9u

&Ԁ:&>>Ѐ< 

�$0H`lrmeshq


9u

�&Ԁv'<<Ѐ<
�$0H`lq


9u

�'Ԁ��AA�������� (��

�$0H`lx$�
rmeshc�Ԁ�<<Ѐ<0

�$0H`lq


9u
��>>Ѐ<@

�$0H`lrmeshq


9u
̙Ԁ-�AA��������0-��

�$0H`lx��
rmesh�7FF��������PH7�

�$0H`lx
+��

��
rmesh

$AA��������@Mf�

�$0H`lx7�
rmesh
��FF��������`h��

�$0H`lx
+f�

b�
rmesh
-�AA��������Pm�

�$0H`lx��
rmesh
�7FF��������p�y�

�$0H`lx
+�

�
rmeshLL�������������� 
��


 

������
 


3LL�������������`
��


 

������
-


s??Ѐ<� E �HԀ����<� ��E�@
+


s??Ѐ<�

� �HԀ����<� ��E�@
 


 


�
	l�LL�<� ��

 


-


�#Ԁ
$AA��������p���

�$0H`lz�
4mesh:%LL��������������
��


+


�#Ԁ
$AA��������p���

�$0H`lxz�
rmesh:%LL��������������
��


 


������
 

e%LL��������������
��


 


������
-

��FF�����������

�$0H`l
-��

��
4mesh�1LL��������������
��


+

��FF�����������

�$0H`lx
+��

��
rmesh�1LL��������������
��


 

������
-


�1LL��������������
��


+


�1LL��������������
��


 

������
-


�;LL����������������


+


V;LL����������������


 


������
-

<LL����������������


+

�;LL����������������


 


������
 

> LL�������������
��


 


������
 

i LL����������������


 


������
-

8!EEЀ������� D% 
�
;"??Ѐ<
 E ,
K"Ԁ�"LL�<� ��

+

8!EEЀ�������

�% 
�
;"??Ѐ<


� ,
K"Ԁ�"LL�<� ��

 


 


_#Ԁ$LL�< 
��

 


-


%EEЀ������0
 D%

��
k'Ԁ�'??Ѐ<@
 E�,
	(Ԁ{,Ԁ�-���<P
��E�@
+


%EEЀ������0


�%

��
k'Ԁ�'??Ѐ<@


��,
	(Ԁ{,Ԁ�-���<P
��E�@
 



 

�

 l�-Ԁ.LL�������������� 
��


@@ -45,24 +45,25 @@
 �
l�5Ԁ7���<�
��E�@
 


 



-�
l-�AA��������
�I&�

�$0H`l�
4mesh�7FF���������
Ȼ&�

�$0H`l
-J&�

E�
4mesh
���<�
 ��E�
@
+�
l-�AA��������
�I&�

�$0H`lx�
rmesh�7FF���������
Ȼ&�

�$0H`lx
+J&�

E�
rmesh
���<�
 ��E�
@
 


-


�
	l	Ԁ
$AA��������
��-�

�$0H`l�&�
4mesh��FF���������
�\.�

�$0H`l
-�-�

�&�
4mesh+ԀZ���<�
��E�
@
+


�
	l	Ԁ
$AA��������
��-�

�$0H`lx�&�
rmesh��FF���������
�\.�

�$0H`lx
+�-�

�&�
rmesh�Ԁ
+���<�
��E�
@
 



 

�

-ljԀ����< 
 ��E�
@
+lԀq���< 
 ��E�
@
 


 



-�
l ԀC!���<�
��E�
@
+�
l�Ԁ� ���<�
��E�
@
 


 



-�
l-�AA��������0
�5�

�$0H`l].�
4mesh�7FF���������
�5�

�$0H`l
-�5�

�.�
4mesh
���<�
 ��E�@
+�
l-�AA��������0
�5�

�$0H`lx].�
rmesh�7FF���������
�5�

�$0H`lx
+�5�

�.�
rmesh
���<�
 ��E�@
 


-


�
	lVԀ
$AA��������@

-=�

�$0H`l�5�
4mesh��FF��������(�=�

�$0H`l
--=�

(6�
4mesh�Ԁ����<��E�@
+


�
	lԀ
$AA��������@

-=�

�$0H`lx�5�
rmesh��FF��������(�=�

�$0H`lx
+-=�

(6�
rmesh�Ԁ����<��E�@
 



 

�

 l�Ԁ!���<P
 ��E�@
@@ -71,5 +72,5 @@
 �
lbԀS ���< ��E�@
 


 



-�
l-�AA��������`
-�D�

�$0H`l�=�
4mesh�7FF��������0H@E�

�$0H`l
-�D�

�=�
4mesh
\ No newline at end of file
+�
l-�AA��������`
-�D�

�$0H`lx�=�
rmesh�7FF��������0H@E�

�$0H`lx
+�D�

�=�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/pmp-regression-test-0-1.pcap ns-3.23/src/mesh/test/dot11s/pmp-regression-test-0-1.pcap
--- ns-3.22/src/mesh/test/dot11s/pmp-regression-test-0-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/pmp-regression-test-0-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1 +1 @@
-��i��<<�����������

�$0H`l4mesh�RRЀ<

J

�$0H`l4mesh3
������97
��Ԁ
��PPЀ<

J

�$0H`l3
������97


��Ԁ�RRЀ<
 J

�$0H`l4mesh3
������97
��Ԁ��PPЀ<


J

�$0H`l3
������97


��Ԁ
JO
AA��������

 JO
�

�$0H`l��
4mesh#jAA��������0�i�

�$0H`lO
�
4meshj�AA��������

0j��

�$0H`lj�
4mesh
\ No newline at end of file
+��i��<<�����������

�$0H`lxrmesh�>>Ѐ<



�$0H`lrmeshq


9u

��Ԁ
O�<<Ѐ<

�$0H`lq


9u

_�Ԁ+�>>Ѐ<
 

�$0H`lrmeshq


9u

;�Ԁ��<<Ѐ<


�$0H`lq


9u

-�Ԁ
JO
AA��������

 JO
�

�$0H`lx��
rmesh#jAA��������0�i�

�$0H`lxO
�
rmeshj�AA��������

0j��

�$0H`lxj�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/dot11s/pmp-regression-test-1-1.pcap ns-3.23/src/mesh/test/dot11s/pmp-regression-test-1-1.pcap
--- ns-3.22/src/mesh/test/dot11s/pmp-regression-test-1-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/dot11s/pmp-regression-test-1-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1 +1 @@
-��i��<<�����������

�$0H`l4mesh��RRЀ<

J

�$0H`l4mesh3
������97
��Ԁ
�PPЀ<

J

�$0H`l3
������97


��Ԁ��RRЀ<
 J

�$0H`l4mesh3
������97
��Ԁa�PPЀ<


J

�$0H`l3
������97


q�Ԁ
�O
AA��������

 JO
�

�$0H`l��
4mesh�iAA��������0�i�

�$0H`lO
�
4mesh��AA��������

0j��

�$0H`lj�
4mesh
\ No newline at end of file
+��i��<<�����������

�$0H`lxrmesh��>>Ѐ<



�$0H`lrmeshq


9u

��Ԁ
��<<Ѐ<

�$0H`lq


9u

��Ԁ��>>Ѐ<
 

�$0H`lrmeshq


9u

g�Ԁ��<<Ѐ<


�$0H`lq


9u


�Ԁ
�O
AA��������

 JO
�

�$0H`lx��
rmesh�iAA��������0�i�

�$0H`lxO
�
rmesh��AA��������

0j��

�$0H`lxj�
rmesh
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/flame/flame-regression-test-0-1.pcap ns-3.23/src/mesh/test/flame/flame-regression-test-0-1.pcap
--- ns-3.22/src/mesh/test/flame/flame-regression-test-0-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/flame/flame-regression-test-0-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,65 +1,70 @@
-��iL
XX���������������@@
������


+��i
t$XX���������������@@

������


 

������
-


w
XX�<

��@@




+



�$XX�<

��@@




 



-

DԀ
XX�<
��@@





+


l%Ԁ

B&XX�<
��@@





 



-

�XX�������
��������@@������


+


�&XX�������
��������@@
������


 

������
-


�Ԁnll�<

 ��@@

E0@
+



�)Ԁ
�*ll�<

 ��@@

E0@
 


-


�
	~Ԁ�<<�������
������ 
��@@������
"	<<�������������0
��@@
������
�*XX�������
������0
��@@������




+


�
	
�*Ԁ
�*<<�������
������ 
��@@������

A,<<�������������0
��@@
������

�MXX�������
������0
��@@������




 


������
-

�+XX�������������@
��@@
������




+



OXX�������������@
��@@
������




 


������
-

�,Ԁ�.XX�<

P��@@



+


�OԀ
�QXX�<

P��@@



 



-


�.Ԁ-/ll�<
@
��@@
E0@
+



�QԀ
LRll�<
@
��@@
E0@
 



-

	�
0Ԁ
	1ll�<`
��@@

E0@
+

	�

1SԀ

(Tll�<`
��@@

E0@
 



-

	�
��
ԀX�
ll�<

p��@@

E0
@
+

	�
��
ԀX�
ll�<

p��@@

E0
@
 


 


�
	h�
Ԁ��
ll�<
P
��@@
E0
@
 



 

	�
��
Ԁ
��
ll�<�
��@@

E0
@
 



-

	�
%Ԁ�ll�<

���@@

E0@
+

	�
%Ԁ�ll�<

���@@

E0@
 


 


�
	Ԁ_ll�<
`
��@@
E0@
 



 

	�
DԀ
ll�<�
��@@

E0@
 



-

	�
ŔԀ��ll�<

���@@

E0@
+

	�
ŔԀ��ll�<

���@@

E0@
 


 


�
	��Ԁ��ll�<
p
��@@
E0@
 



-

	�
�Ԁ
S�ll�<�
��@@

E0@
+

	�
�Ԁ
�ll�<�
��@@

E0@
 



-

	�
eԀ8ll�<

���@@

E0@
+

	�
eԀ8ll�<

���@@

E0@
 


 


�
	HԀ�ll�<
�
��@@
E0@
 



-

	�
�Ԁ
Wll�<�
��@@

E0@
+

	�
Mll�<
�
��@@
E0@
 



-

	�
�Ԁآll�<

���@@
	
E0@
+

	�
2Ԁ
 ll�<�
��@@

E0@
+



+

	�
��ll�������
���@@

E0@
 


-


�
	�Ԁ?�ll�<
�
��@@	
E0@
+


�
	Ǣ<<�������
�������
��@@	������
Z�ll�<
�
��@@
+
E0@
+



+

	�
?�Ԁ
5�<<�������������

��@@
	������
��ll�<

��@@

+
E0@
 



-

	�
$�Ԁ
Q�ll�<

��@@
	
E0@
+

	�
w�ll�<

��@@

+
E0@
 



-

	�
<)	ll�������

��@@

-
E0@
+

	�
�(	Ԁx)	ll�<

 
��@@
	
E0@
 


-


�
	g)	<<�������
�������
��@@
-������
�)	ll�<
�
��@@
E0@
+


�
	�)	Ԁ�)	ll�<
�
��@@
E0@
 



-

	�
�*	Ԁ
�+	<<������������� 

��@@

-������
*-	ll�<0

��@@

E0@
+

	�
�*	Ԁ
�+	ll�<0

��@@

E0@
 



 

	�
E�
 Ԁ�
-ll�<

@
��@@

E0@
+ll�<

@
��@@

+
E0@
 


 


�
	(�
 Ԁ�
@@ -69,10 +74,10 @@
 Ԁ
@�
 ll�<P

��@@

E0@
 



-

	�
	�5Ԁ	�6ll�<

`
��@@

E0@
+

	�
	�9ll�<

`
��@@

E0@
 


-


�
		�6Ԁ	7ll�<
�
��@@

E0@
+


�
		�9Ԁ	�9ll�<
�
��@@

E0@
 



-

	�
	8Ԁ
	9ll�<p

��@@


E0@
+

	�
	�:Ԁ
	�;ll�<p

��@@


E0@
 



 

	�

\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/flame/flame-regression-test-1-1.pcap ns-3.23/src/mesh/test/flame/flame-regression-test-1-1.pcap
--- ns-3.22/src/mesh/test/flame/flame-regression-test-1-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/flame/flame-regression-test-1-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,90 +1,90 @@
-��i�XX���������������@@������


+��i
�#XX���������������@@
������


 

������
-


�XX���������������@@
������


+



�#XX���������������@@

������


 

������
-


XX�<

��@@




+



/%XX�<

��@@




 



-

Ԁ
�XX�<
��@@





+


?%Ԁ

�%XX�<
��@@





 



-

VԀ^ll�<
 ��@@
E0@
+


~&Ԁ
})ll�<
��@@
E0@
 


-


�
	nԀ�ll�<

 ��@@

E0@
+


�
	
�)Ԁ
�)ll�<

 ��@@

E0@
 


-


�
	�Ԁ=<<�������
������ 
��@@������
�<<�������������0
��@@
������
�	<<�������������0
��@@������
&+XX�������
������0
��@@������




+


�
	
�*Ԁ
\+<<�������
������ 
��@@������

�+<<�������������0
��@@
������

�,<<������������� 
��@@������

ENXX�������
������0
��@@������




 


������
-

Q+XX�������������@
��@@
������




+


pNXX�������������@
��@@
������




 


������
-

�,XX�<
@��@@


+


�OXX�<
0��@@


 



-


�,Ԁ�-XX�������������P
��@@������




+



�OԀ
�PXX�������������@
��@@������




 


������
-

5.XX�<

P��@@



+


TQXX�<

P��@@



 



-


/Ԁ�/ll�<
@
��@@
E0@
+



!RԀ
�Rll�<
@
��@@
E0@
 



-

	�
�/Ԁ
`0ll�<`
��@@

E0@
+

	�

SԀ

Sll�<`
��@@

E0@
 



-

	�
E1ԀH�
ll�<
`��@@
E0
@
+

	�

dTԀH�
ll�<
P��@@
E0
@
 


-


�
	X�
Ԁ��
ll�<

p��@@

E0
@
+


�
	X�
Ԁ��
ll�<

p��@@

E0
@
 


 


�
	��
Ԁg�
ll�<
P
��@@
E0
@
 



 

	�
w�
Ԁ
�
ll�<�
��@@

E0
@
 



-

	�
׊
Ԁ�
ll�<
p��@@
E0@
+

	�
׊
Ԁ�
ll�<
`��@@
E0@
 


-


�
	�
ԀOll�<

���@@

E0@
+


�
	�
ԀOll�<

���@@

E0@
 


 


�
	4Ԁll�<
`
��@@
E0@
 



 

	�
Ԁ
nll�<�
��@@

E0@
 



-

	�
SԀ��ll�<
���@@
E0@
+

	�
SԀ��ll�<
p��@@
E0@
 


-


�
	��Ԁ�ll�<

���@@

E0@
+


�
	��Ԁ�ll�<

���@@

E0@
 


 


�
	ԕԀ��ll�<
p
��@@
E0@
 



 

	�
��Ԁ
h�ll�<�
��@@

E0@
 



-

	�
��ll�<�
��@@

E0@
-



-

	�
��Ԁ(ll�<
���@@
E0@
+

	�
M�Ԁ(ll�<
���@@
E0@
 


-


�
	8Ԁ�ll�<

���@@

E0@
+


�
	8Ԁ�ll�<

���@@

E0@
 


-


�
	tԀGll�<
�
��@@
E0@
+


�
	tԀ�ll�<
�
��@@
E0@
 



-

	�
WԀ
�ll�<�
��@@

E0@
+

	�
Ԁ
\ll�<�
��@@

E0@
 



-

	�
�Ԁȡll�<
���@@	
E0@
+

	�
A Ԁȡll�������
���@@
E0@
 


-


�
	ءԀ/�ll�<

���@@
	
E0@
+


�
	�ll�������
���@@

E0@
 


-


�
	�Ԁ�ll�<
�
��@@	
E0@
+


�
	/�<<�������
�������
��@@	������
�ll�<
�
��@@
+
E0@
+



+

	�
�Ԁ
̤<<�������������

��@@
	������
ȥ<<��������������
��@@	������
M�ll�<

��@@

+
E0@
 



-

	�
��Ԁ
��ll�<

��@@
	
E0@
+

	�
Χll�<

��@@

+
E0@
 



-

	�
��Ԁh(	ll�������
���@@
-
E0@
+

	�
��Ԁh(	ll�<
���@@	
E0@
 


-


�
	�(	ll�������

��@@

-
E0@
+


�
	x(	Ԁ�(	ll�<

 
��@@
	
E0@
 


-


�
	�)	<<�������
�������
��@@
-������
�*	ll�<
�
��@@
E0@
+


�
	�)	Ԁ�*	ll�<
�
��@@
E0@
 



-

	�
�*	Ԁ
?+	<<������������� 

��@@

-������
;,	<<��������������
��@@
-������
�,	ll�<0

��@@

E0@
+

	�
�*	Ԁ
	+	ll�<0

��@@

E0@
 



-

	�
f-	Ԁ�
-ll�<
���@@
E0@
+

	�
�+	Ԁ�
+ll�<
���@@
+
E0@
 


 


�
	�
 Ԁo�
-ll�<

@
��@@

E0@
+ll�<

@
��@@

+
E0@
 


 


�
	T�
 Ԁ'�
@@ -95,12 +95,14 @@
 ll�<P

��@@

E0@
 



 

	�
|�
-Ԁ	�5ll�<
���@@
E0@
+Ԁ	�6ll�<
���@@
E0@
+


+


�
		�6Ԁ	H7ll�<

`
��@@

E0@
 


-


�
		�5Ԁ	6ll�<

`
��@@

E0@
+


�
		�8ll�<

`
��@@

E0@
 


-


�
		�6Ԁ	�7ll�<
�
��@@

E0@
+


�
		�9Ԁ	�:ll�<
�
��@@

E0@
 



-

	�
	�7Ԁ
	m8ll�<p

��@@


E0@
+

	�
	�:Ԁ
	;ll�<p

��@@


E0@
 



-

	�
	R9Ԁ
\ No newline at end of file
+

	�
	�;Ԁ
\ No newline at end of file
diff -Naur ns-3.22/src/mesh/test/flame/flame-regression-test-2-1.pcap ns-3.23/src/mesh/test/flame/flame-regression-test-2-1.pcap
--- ns-3.22/src/mesh/test/flame/flame-regression-test-2-1.pcap	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mesh/test/flame/flame-regression-test-2-1.pcap	2015-05-13 11:05:27.000000000 -0700
@@ -1,83 +1,84 @@
 ��i
(#XX���������������@@
������


 

������
-


XX���������������@@������


+



t$XX���������������@@

������


 

������
-


L
XX���������������@@
������


-

������
-


DԀ
XX�<
��@@





+



l%Ԁ

B&XX�<
��@@





 



-

*Ԁ�ll�<
 ��@@
E0@
+


R&Ԁ
�&ll�<
��@@
E0@
 


-


�
	�ll�<
 ��@@
E0@
+


�
	
�(ll�<
��@@
E0@
 


-


�
	�Ԁnll�<

 ��@@

E0@
+


�
	
�)Ԁ
�*ll�<

 ��@@

E0@
 


-


�
	"	<<�������������0
��@@
������
M	<<�������������0
��@@������
�+XX�������������@
��@@
������




+


�
	
A,<<�������������0
��@@
������

l,<<������������� 
��@@������


OXX�������������@
��@@
������




 


������
-


,XX�<
@��@@


+


,OXX�<
0��@@


 



-


�,Ԁ-XX�������������P
��@@������




+



�OԀ
QPXX�������������@
��@@������




 


������
-

�.XX�<

P��@@



+


�QXX�<

P��@@



 



-


0Ԁ
	1ll�<`
��@@

E0@
+



1SԀ

(Tll�<`
��@@

E0@
 



-

	�
1Ԁ��
ll�<
`��@@
E0
@
+

	�

8TԀ��
ll�<
P��@@
E0
@
 


-


�
	��
ԀX�
ll�<

p��@@

E0
@
+


�
	��
ԀX�
ll�<

p��@@

E0
@
 


 


�
	��
Ԁ
��
ll�<�
��@@

E0
@
 



-

	�
��
Ԁ@
ll�<
p��@@
E0@
+

	�
��
Ԁ@
ll�<
`��@@
E0@
 


-


�
	%Ԁ�ll�<

���@@

E0@
+


�
	%Ԁ�ll�<

���@@

E0@
 


 


�
	DԀ
ll�<�
��@@

E0@
 



-

	�
'Ԁ��ll�<
���@@
E0@
+

	�
'Ԁ��ll�<
p��@@
E0@
 


-


�
	ŔԀ��ll�<

���@@

E0@
+


�
	ŔԀ��ll�<

���@@

E0@
 


-


�
	�Ԁ
S�ll�<�
��@@

E0@
+


�
	�Ԁ
�ll�<�
��@@

E0@
 



-

	�
c�Ԁ�ll�<
���@@
E0@
+

	�
!�Ԁ�ll�<
���@@
E0@
 


-


�
	eԀ8ll�<

���@@

E0@
+


�
	eԀ8ll�<

���@@

E0@
 


-


�
	�Ԁ
Wll�<�
��@@

E0@
+


�
	2Ԁ
 ll�<�
��@@

E0@
 



-

	�
gԀ �ll�<
���@@	
E0@
+

	�
 Ԁ �ll�������
���@@
E0@
 


-


�
	�Ԁآll�<

���@@
	
E0@
+


�
	��ll�������
���@@

E0@
 


-


�
	$�Ԁ
Q�ll�<

��@@
	
E0@
+


�
	?�Ԁ
5�<<�������������

��@@
	������
`�<<��������������
��@@	������
w�ll�<

��@@

+
E0@
 



-

	�
a�Ԁ�'	ll�������
���@@
-
E0@
+

	�
��Ԁ�'	ll�<
���@@	
E0@
 


-


�
	<)	ll�������

��@@

-
E0@
+


�
	�(	Ԁx)	ll�<

 
��@@
	
E0@
 


-


�
	�*	Ԁ
�+	<<������������� 

��@@

-������
�+	<<��������������
��@@
-������
*-	ll�<0

��@@

E0@
+


�
	�*	Ԁ
�+	ll�<0

��@@

E0@
 



-

	�
:-	Ԁ`�
-ll�<
���@@
E0@
+

	�
�+	Ԁ`�
+ll�<
���@@
+
E0@
 


 


�
	E�
 Ԁ�
-ll�<

@
��@@

E0@
+ll�<

@
��@@

+
E0@
 


 


�
	d�
 Ԁ
@�
 ll�<P

��@@

E0@
 



 

	�
P�
-Ԁ	5ll�<
���@@
E0@
+Ԁ	5ll�<
���@@
E0@
+


+


�
		96ll�<
���@@
E0@
+


+


�
		7Ԁ	�7ll�<

`
��@@

E0@
 


-


�
		�5Ԁ	�6ll�<

`
��@@

E0@
+


�
		�9ll�<

`
��@@

E0@
 


-


�
		8Ԁ
	9ll�<p

��@@


E0@
+


�
		�:Ԁ
	�;ll�<p

��@@


E0@
 



-

	�
	&9Ԁ
\ No newline at end of file
+

	�
	�;Ԁ
\ No newline at end of file
diff -Naur ns-3.22/src/mobility/bindings/modulegen__gcc_ILP32.py ns-3.23/src/mobility/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/mobility/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mobility/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,10 @@
     module.add_class('ConstantVelocityHelper')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## geographic-positions.h (module 'mobility'): ns3::GeographicPositions [class]
+    module.add_class('GeographicPositions')
+    ## geographic-positions.h (module 'mobility'): ns3::GeographicPositions::EarthSpheroidType [enumeration]
+    module.add_enum('EarthSpheroidType', ['SPHERE', 'GRS80', 'WGS84'], outer_class=root_module['ns3::GeographicPositions'])
     ## hash.h (module 'core'): ns3::Hasher [class]
     module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -268,6 +272,7 @@
     module.add_class('GaussMarkovMobilityModel', parent=root_module['ns3::MobilityModel'])
     ## hierarchical-mobility-model.h (module 'mobility'): ns3::HierarchicalMobilityModel [class]
     module.add_class('HierarchicalMobilityModel', parent=root_module['ns3::MobilityModel'])
+    module.add_container('std::list< ns3::Vector3D >', 'ns3::Vector3D', container_type=u'list')
     typehandlers.add_type_alias(u'ns3::Vector3D', u'ns3::Vector')
     typehandlers.add_type_alias(u'ns3::Vector3D*', u'ns3::Vector*')
     typehandlers.add_type_alias(u'ns3::Vector3D&', u'ns3::Vector&')
@@ -335,6 +340,7 @@
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3ConstantVelocityHelper_methods(root_module, root_module['ns3::ConstantVelocityHelper'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3GeographicPositions_methods(root_module, root_module['ns3::GeographicPositions'])
     register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
@@ -710,6 +716,23 @@
                    is_const=True)
     return
 
+def register_Ns3GeographicPositions_methods(root_module, cls):
+    ## geographic-positions.h (module 'mobility'): ns3::GeographicPositions::GeographicPositions() [constructor]
+    cls.add_constructor([])
+    ## geographic-positions.h (module 'mobility'): ns3::GeographicPositions::GeographicPositions(ns3::GeographicPositions const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::GeographicPositions const &', 'arg0')])
+    ## geographic-positions.h (module 'mobility'): static ns3::Vector ns3::GeographicPositions::GeographicToCartesianCoordinates(double latitude, double longitude, double altitude, ns3::GeographicPositions::EarthSpheroidType sphType) [member function]
+    cls.add_method('GeographicToCartesianCoordinates', 
+                   'ns3::Vector', 
+                   [param('double', 'latitude'), param('double', 'longitude'), param('double', 'altitude'), param('ns3::GeographicPositions::EarthSpheroidType', 'sphType')], 
+                   is_static=True)
+    ## geographic-positions.h (module 'mobility'): static std::list<ns3::Vector3D,std::allocator<ns3::Vector3D> > ns3::GeographicPositions::RandCartesianPointsAroundGeographicPoint(double originLatitude, double originLongitude, double maxAltitude, int numPoints, double maxDistFromOrigin, ns3::Ptr<ns3::UniformRandomVariable> uniRand) [member function]
+    cls.add_method('RandCartesianPointsAroundGeographicPoint', 
+                   'std::list< ns3::Vector3D >', 
+                   [param('double', 'originLatitude'), param('double', 'originLongitude'), param('double', 'maxAltitude'), param('int', 'numPoints'), param('double', 'maxDistFromOrigin'), param('ns3::Ptr< ns3::UniformRandomVariable >', 'uniRand')], 
+                   is_static=True)
+    return
+
 def register_Ns3Hasher_methods(root_module, cls):
     ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
diff -Naur ns-3.22/src/mobility/bindings/modulegen__gcc_LP64.py ns-3.23/src/mobility/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/mobility/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mobility/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,10 @@
     module.add_class('ConstantVelocityHelper')
     ## event-id.h (module 'core'): ns3::EventId [class]
     module.add_class('EventId', import_from_module='ns.core')
+    ## geographic-positions.h (module 'mobility'): ns3::GeographicPositions [class]
+    module.add_class('GeographicPositions')
+    ## geographic-positions.h (module 'mobility'): ns3::GeographicPositions::EarthSpheroidType [enumeration]
+    module.add_enum('EarthSpheroidType', ['SPHERE', 'GRS80', 'WGS84'], outer_class=root_module['ns3::GeographicPositions'])
     ## hash.h (module 'core'): ns3::Hasher [class]
     module.add_class('Hasher', import_from_module='ns.core')
     ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class]
@@ -268,6 +272,7 @@
     module.add_class('GaussMarkovMobilityModel', parent=root_module['ns3::MobilityModel'])
     ## hierarchical-mobility-model.h (module 'mobility'): ns3::HierarchicalMobilityModel [class]
     module.add_class('HierarchicalMobilityModel', parent=root_module['ns3::MobilityModel'])
+    module.add_container('std::list< ns3::Vector3D >', 'ns3::Vector3D', container_type=u'list')
     typehandlers.add_type_alias(u'ns3::Vector3D', u'ns3::Vector')
     typehandlers.add_type_alias(u'ns3::Vector3D*', u'ns3::Vector*')
     typehandlers.add_type_alias(u'ns3::Vector3D&', u'ns3::Vector&')
@@ -335,6 +340,7 @@
     register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase'])
     register_Ns3ConstantVelocityHelper_methods(root_module, root_module['ns3::ConstantVelocityHelper'])
     register_Ns3EventId_methods(root_module, root_module['ns3::EventId'])
+    register_Ns3GeographicPositions_methods(root_module, root_module['ns3::GeographicPositions'])
     register_Ns3Hasher_methods(root_module, root_module['ns3::Hasher'])
     register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address'])
     register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
@@ -710,6 +716,23 @@
                    is_const=True)
     return
 
+def register_Ns3GeographicPositions_methods(root_module, cls):
+    ## geographic-positions.h (module 'mobility'): ns3::GeographicPositions::GeographicPositions() [constructor]
+    cls.add_constructor([])
+    ## geographic-positions.h (module 'mobility'): ns3::GeographicPositions::GeographicPositions(ns3::GeographicPositions const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::GeographicPositions const &', 'arg0')])
+    ## geographic-positions.h (module 'mobility'): static ns3::Vector ns3::GeographicPositions::GeographicToCartesianCoordinates(double latitude, double longitude, double altitude, ns3::GeographicPositions::EarthSpheroidType sphType) [member function]
+    cls.add_method('GeographicToCartesianCoordinates', 
+                   'ns3::Vector', 
+                   [param('double', 'latitude'), param('double', 'longitude'), param('double', 'altitude'), param('ns3::GeographicPositions::EarthSpheroidType', 'sphType')], 
+                   is_static=True)
+    ## geographic-positions.h (module 'mobility'): static std::list<ns3::Vector3D,std::allocator<ns3::Vector3D> > ns3::GeographicPositions::RandCartesianPointsAroundGeographicPoint(double originLatitude, double originLongitude, double maxAltitude, int numPoints, double maxDistFromOrigin, ns3::Ptr<ns3::UniformRandomVariable> uniRand) [member function]
+    cls.add_method('RandCartesianPointsAroundGeographicPoint', 
+                   'std::list< ns3::Vector3D >', 
+                   [param('double', 'originLatitude'), param('double', 'originLongitude'), param('double', 'maxAltitude'), param('int', 'numPoints'), param('double', 'maxDistFromOrigin'), param('ns3::Ptr< ns3::UniformRandomVariable >', 'uniRand')], 
+                   is_static=True)
+    return
+
 def register_Ns3Hasher_methods(root_module, cls):
     ## hash.h (module 'core'): ns3::Hasher::Hasher(ns3::Hasher const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Hasher const &', 'arg0')])
diff -Naur ns-3.22/src/mobility/model/constant-acceleration-mobility-model.cc ns-3.23/src/mobility/model/constant-acceleration-mobility-model.cc
--- ns-3.22/src/mobility/model/constant-acceleration-mobility-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mobility/model/constant-acceleration-mobility-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -26,6 +26,7 @@
 {
   static TypeId tid = TypeId ("ns3::ConstantAccelerationMobilityModel")
     .SetParent<MobilityModel> ()
+    .SetGroupName ("Mobility")
     .AddConstructor<ConstantAccelerationMobilityModel> ();
   return tid;
 }
diff -Naur ns-3.22/src/mobility/model/constant-position-mobility-model.cc ns-3.23/src/mobility/model/constant-position-mobility-model.cc
--- ns-3.22/src/mobility/model/constant-position-mobility-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mobility/model/constant-position-mobility-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -28,6 +28,7 @@
 {
   static TypeId tid = TypeId ("ns3::ConstantPositionMobilityModel")
     .SetParent<MobilityModel> ()
+    .SetGroupName ("Mobility")
     .AddConstructor<ConstantPositionMobilityModel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/mobility/model/constant-velocity-mobility-model.cc ns-3.23/src/mobility/model/constant-velocity-mobility-model.cc
--- ns-3.22/src/mobility/model/constant-velocity-mobility-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mobility/model/constant-velocity-mobility-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -28,6 +28,7 @@
 {
   static TypeId tid = TypeId ("ns3::ConstantVelocityMobilityModel")
     .SetParent<MobilityModel> ()
+    .SetGroupName ("Mobility")
     .AddConstructor<ConstantVelocityMobilityModel> ();
   return tid;
 }
diff -Naur ns-3.22/src/mobility/model/geographic-positions.cc ns-3.23/src/mobility/model/geographic-positions.cc
--- ns-3.22/src/mobility/model/geographic-positions.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/mobility/model/geographic-positions.cc	2015-05-13 11:05:27.000000000 -0700
@@ -0,0 +1,178 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#include <ns3/log.h>
+#include <cmath>
+#include "geographic-positions.h"
+
+NS_LOG_COMPONENT_DEFINE ("GeographicPositions");
+
+namespace ns3 {
+
+// earth's radius in meters if modeled as a perfect sphere
+static const double EARTH_RADIUS = 6371e3; 
+
+/**
+ * GRS80 and WGS84 sources
+ * 
+ * Moritz, H. "Geodetic Reference System 1980." GEODETIC REFERENCE SYSTEM 1980. 
+ * <http://www.gfy.ku.dk/~iag/HB2000/part4/grs80_corr.htm>.
+ * 
+ * "Department of Defense World Geodetic System 1984." National Imagery and 
+ * Mapping Agency, 1 Jan. 2000. 
+ * <http://earth-info.nga.mil/GandG/publications/tr8350.2/wgs84fin.pdf>.
+ */
+
+// earth's semi-major axis in meters as defined by both GRS80 and WGS84
+static const double EARTH_SEMIMAJOR_AXIS = 6378137;
+
+// earth's first eccentricity as defined by GRS80
+static const double EARTH_GRS80_ECCENTRICITY = 0.0818191910428158;
+
+// earth's first eccentricity as defined by WGS84
+static const double EARTH_WGS84_ECCENTRICITY = 0.0818191908426215;
+
+Vector
+GeographicPositions::GeographicToCartesianCoordinates (double latitude, 
+                                                       double longitude, 
+                                                       double altitude,
+                                                       EarthSpheroidType sphType)
+{
+  NS_LOG_FUNCTION_NOARGS ();
+  double latitudeRadians = 0.01745329 * latitude;
+  double longitudeRadians = 0.01745329 * longitude;
+  double a; // semi-major axis of earth
+  double e; // first eccentricity of earth
+  if (sphType == SPHERE)
+    {
+      a = EARTH_RADIUS;
+      e = 0;
+    }
+  else if (sphType == GRS80)
+    {
+      a = EARTH_SEMIMAJOR_AXIS;
+      e = EARTH_GRS80_ECCENTRICITY;
+    }
+  else // if sphType == WGS84
+    {
+      a = EARTH_SEMIMAJOR_AXIS;
+      e = EARTH_WGS84_ECCENTRICITY;
+    }
+
+  double Rn = a / (sqrt (1 - pow (e, 2) * pow (sin (latitudeRadians), 2))); // radius of
+                                                                           // curvature
+  double x = (Rn + altitude) * cos (latitudeRadians) * cos (longitudeRadians);
+  double y = (Rn + altitude) * cos (latitudeRadians) * sin (longitudeRadians);
+  double z = ((1 - pow (e, 2)) * Rn + altitude) * sin (latitudeRadians);
+  Vector cartesianCoordinates = Vector (x, y, z);
+  return cartesianCoordinates;
+}
+
+std::list<Vector>
+GeographicPositions::RandCartesianPointsAroundGeographicPoint (double originLatitude, 
+                                                               double originLongitude, 
+                                                               double maxAltitude,
+                                                               int numPoints, 
+                                                               double maxDistFromOrigin,
+                                                               Ptr<UniformRandomVariable> uniRand)
+{
+  NS_LOG_FUNCTION_NOARGS ();
+  // fixes divide by zero case and limits latitude bounds
+  if (originLatitude >= 90)
+    {
+      NS_LOG_WARN ("origin latitude must be less than 90. setting to 89.999");
+      originLatitude = 89.999;
+    }
+  else if (originLatitude <= -90)
+    {
+      NS_LOG_WARN ("origin latitude must be greater than -90. setting to -89.999");
+      originLatitude = -89.999;
+    }
+
+  // restricts maximum altitude from being less than zero (below earth's surface).
+  // sets maximum altitude equal to zero if parameter is set to be less than zero.
+  if (maxAltitude < 0)
+    {
+      NS_LOG_WARN ("maximum altitude must be greater than or equal to 0. setting to 0");
+      maxAltitude = 0;
+    }
+
+  double originLatitudeRadians = originLatitude * (M_PI / 180);
+  double originLongitudeRadians = originLongitude * (M_PI / 180);
+  double originColatitude = (M_PI / 2) - originLatitudeRadians;
+
+  double a = maxDistFromOrigin / EARTH_RADIUS; // maximum alpha allowed 
+                                               // (arc length formula)
+  if (a > M_PI)
+    {
+      a = M_PI; // pi is largest alpha possible (polar angle from origin that 
+                // points can be generated within)
+    }
+  
+  std::list<Vector> generatedPoints;
+  for (int i = 0; i < numPoints; i++)
+    {
+      // random distance from North Pole (towards center of earth)
+      double d = uniRand->GetValue (0, EARTH_RADIUS - EARTH_RADIUS * cos (a)); 
+      // random angle in latitude slice (wrt Prime Meridian), radians
+      double phi = uniRand->GetValue (0, M_PI * 2); 
+      // random angle from Center of Earth (wrt North Pole), radians
+      double alpha = acos((EARTH_RADIUS - d) / EARTH_RADIUS); 
+
+      // shift coordinate system from North Pole referred to origin point referred
+      // reference: http://en.wikibooks.org/wiki/General_Astronomy/Coordinate_Systems
+      double theta = M_PI / 2 - alpha; // angle of elevation of new point wrt 
+                                       // origin point (latitude in coordinate 
+                                       // system referred to origin point)
+      double randPointLatitude = asin(sin(theta)*cos(originColatitude) + 
+                                 cos(theta)*sin(originColatitude)*sin(phi)); 
+                                 // declination
+      double intermedLong = asin((sin(randPointLatitude)*cos(originColatitude) - 
+                            sin(theta)) / (cos(randPointLatitude)*sin(originColatitude))); 
+                            // right ascension
+      intermedLong = intermedLong + M_PI / 2; // shift to longitude 0
+
+      //flip / mirror point if it has phi in quadrant II or III (wasn't 
+      //resolved correctly by arcsin) across longitude 0
+      if (phi > (M_PI / 2) && phi <= ((3 * M_PI) / 2))
+      intermedLong = -intermedLong;
+
+      // shift longitude to be referenced to origin
+      double randPointLongitude = intermedLong + originLongitudeRadians; 
+
+      // random altitude above earth's surface
+      double randAltitude = uniRand->GetValue (0, maxAltitude);
+
+      Vector pointPosition = GeographicPositions::GeographicToCartesianCoordinates 
+                             (randPointLatitude * (180/M_PI), 
+                              randPointLongitude * (180/M_PI),
+                              randAltitude,
+                              SPHERE);
+                              // convert coordinates 
+                              // from geographic to cartesian
+
+      generatedPoints.push_back (pointPosition); //add generated coordinate 
+                                                      //points to list
+    }
+  return generatedPoints;
+}
+
+} // namespace ns3
+
diff -Naur ns-3.22/src/mobility/model/geographic-positions.h ns-3.23/src/mobility/model/geographic-positions.h
--- ns-3.22/src/mobility/model/geographic-positions.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/mobility/model/geographic-positions.h	2015-05-13 11:05:27.000000000 -0700
@@ -0,0 +1,113 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#include <ns3/vector.h>
+#include <ns3/random-variable-stream.h>
+
+#ifndef GEOGRAPHIC_POSITIONS_H
+#define GEOGRAPHIC_POSITIONS_H
+
+namespace ns3
+{
+
+/**
+ * \ingroup mobility
+ *
+ * Consists of methods dealing with Earth geographic coordinates and locations.
+ */
+class GeographicPositions
+{
+
+public:
+  /** 
+   * Spheroid model to use for earth: perfect sphere (SPHERE), Geodetic 
+   * Reference System 1980 (GRS80), or World Geodetic System 1984 (WGS84)
+   * 
+   * Moritz, H. "Geodetic Reference System 1980." GEODETIC REFERENCE SYSTEM 1980. 
+   * <http://www.gfy.ku.dk/~iag/HB2000/part4/grs80_corr.htm>.
+   * 
+   * "Department of Defense World Geodetic System 1984." National Imagery and 
+   * Mapping Agency, 1 Jan. 2000. 
+   * <http://earth-info.nga.mil/GandG/publications/tr8350.2/wgs84fin.pdf>.
+   */
+  enum EarthSpheroidType
+  {
+    SPHERE,
+    GRS80,
+    WGS84
+  };
+
+  /**
+   * Converts earth geographic/geodetic coordinates (latitude and longitude in 
+   * degrees) with a given altitude above earth's surface (in meters) to Earth 
+   * Centered Earth Fixed (ECEF) Cartesian coordinates (x, y, z in meters), 
+   * where origin (0, 0, 0) is the center of the earth.
+   *
+   * @param latitude earth-referenced latitude (in degrees) of the point
+   * @param longitude earth-referenced longitude (in degrees) of the point
+   * @param altitude height of the point (in meters) above earth's surface
+   * @param sphType earth spheroid model to use for conversion
+   *
+   * @return a vector containing the Cartesian coordinates (x, y, z referenced 
+   * in meters) of the point (origin (0, 0, 0) is center of earth)
+   */
+  static Vector GeographicToCartesianCoordinates (double latitude, 
+                                                  double longitude, 
+                                                  double altitude,
+                                                  EarthSpheroidType sphType);
+
+  /**
+   * Generates uniformly distributed random points (in ECEF Cartesian 
+   * coordinates) within a given altitude above earth's surface centered around 
+   * a given origin point (on earth's surface, in geographic/geodetic coordinates) 
+   * within a given distance radius (using arc length of earth's surface, not 
+   * pythagorean distance).
+   * Distance radius is measured as if all generated points are on earth's 
+   * surface (with altitude = 0).
+   * Assumes earth is a perfect sphere.
+   * 
+   * @param originLatitude origin point latitude in degrees
+   * @param originLongitude origin point longitude in degrees
+   * @param maxAltitude maximum altitude in meters above earth's surface with
+   * which random points can be generated
+   * @param numPoints number of points to generate
+   * @param maxDistFromOrigin max distance in meters from origin with which 
+   * random transmitters can be generated (all transmitters are less than or 
+   * equal to this distance from the origin, relative to points being on earth's 
+   * surface)
+   * @param uniRand pointer to the uniform random variable to use for random 
+   * location and altitude generation
+   *
+   * @return a list containing the vectors (x, y, z location referenced in 
+   * meters from origin at center of earth) of each point generated
+   */
+  static std::list<Vector> RandCartesianPointsAroundGeographicPoint (double originLatitude, 
+                                                                     double originLongitude,
+                                                                     double maxAltitude, 
+                                                                     int numPoints, 
+                                                                     double maxDistFromOrigin,
+                                                                     Ptr<UniformRandomVariable> uniRand);
+
+};
+
+} // namespace ns3
+
+#endif /* GEOGRAPHIC_POSITIONS_H */
+
diff -Naur ns-3.22/src/mobility/model/hierarchical-mobility-model.cc ns-3.23/src/mobility/model/hierarchical-mobility-model.cc
--- ns-3.22/src/mobility/model/hierarchical-mobility-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mobility/model/hierarchical-mobility-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -29,6 +29,7 @@
 {
   static TypeId tid = TypeId ("ns3::HierarchicalMobilityModel")
     .SetParent<MobilityModel> ()
+    .SetGroupName ("Mobility")
     .AddConstructor<HierarchicalMobilityModel> ()
     .AddAttribute ("Child", "The child mobility model.",
                    PointerValue (),
diff -Naur ns-3.22/src/mobility/model/mobility-model.cc ns-3.23/src/mobility/model/mobility-model.cc
--- ns-3.22/src/mobility/model/mobility-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mobility/model/mobility-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::MobilityModel")
     .SetParent<Object> ()
+    .SetGroupName ("Mobility")
     .AddAttribute ("Position", "The current position of the mobility model.",
                    TypeId::ATTR_SET | TypeId::ATTR_GET,
                    VectorValue (Vector (0.0, 0.0, 0.0)),
diff -Naur ns-3.22/src/mobility/test/geo-to-cartesian-test.cc ns-3.23/src/mobility/test/geo-to-cartesian-test.cc
--- ns-3.22/src/mobility/test/geo-to-cartesian-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/mobility/test/geo-to-cartesian-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -0,0 +1,671 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#include <ns3/test.h>
+#include <ns3/log.h>
+#include <ns3/geographic-positions.h>
+
+/**
+ * This test verifies the accuracy of the GeographicToCartesianCoordinates()
+ * method in the GeographicPositions class, which converts earth 
+ * geographic/geodetic coordinates to ECEF Cartesian coordinates. To do so, it 
+ * compares the values generated from the method to values generated from the 
+ * MATLAB function geodetic2ecef(), which is part of the MATLAB Mapping Toolbox, 
+ * using the built-in earth referenceSphere, GRS80 referenceEllipsoid, and WGS84 
+ * referenceEllipsoid in MATLAB. A description of the MATLAB function can be 
+ * found at this webpage: http://www.mathworks.com/help/map/ref/geodetic2ecef.html
+ * Values are compared using 216 test cases for each of the three earth spheroid
+ * models.
+ */
+NS_LOG_COMPONENT_DEFINE ("GeoToCartesianTest");
+
+using namespace ns3;
+
+// 10 meter tolerance for testing, which is very small with respect to ECEF
+// Cartesian coordinates on or above earth's surface
+const double TOLERANCE = 10;
+
+const double XSPHERE_MATLAB[216] = {6371000, 1968747.27116279, -5154247.27116279, 
+-5154247.27116279, 1968747.27116279, 6371000, 1968747.27116279, 608376.364418605, 
+-1592750, -1592750.00000000, 608376.364418605, 1968747.27116279, 
+-5154247.27116279, -1592750, 4169873.63558139, 4169873.63558139, 
+-1592750.00000000, -5154247.27116279, -5154247.27116279, -1592750.00000000, 
+4169873.63558139, 4169873.63558140, -1592750.00000000, -5154247.27116279, 
+1968747.27116279, 608376.364418605, -1592750.00000000, -1592750.00000000, 
+608376.364418604, 1968747.27116279, 6371000, 1968747.27116279, -5154247.27116279, 
+-5154247.27116279, 1968747.27116279, 6371000, 6371200, 1968809.07456167, 
+-5154409.07456167, -5154409.07456167, 1968809.07456166, 6371200, 1968809.07456167, 
+608395.462719168, -1592800, -1592800.00000000, 608395.462719167, 1968809.07456167, 
+-5154409.07456167, -1592800, 4170004.53728083, 4170004.53728083, 
+-1592800.00000000, -5154409.07456167, -5154409.07456167, -1592800, 
+4170004.53728083, 4170004.53728083, -1592800.00000000, -5154409.07456167, 
+1968809.07456166, 608395.462719167, -1592800.00000000, -1592800.00000000, 
+608395.462719167, 1968809.07456166, 6371200, 1968809.07456167, -5154409.07456167, 
+-5154409.07456167, 1968809.07456166, 6371200, 6371400, 1968870.87796054, 
+-5154570.87796054, -5154570.87796054, 1968870.87796054, 6371400, 1968870.87796054, 
+608414.561019730, -1592850, -1592850.00000000, 608414.561019730, 1968870.87796054, 
+-5154570.87796054, -1592850, 4170135.43898027, 4170135.43898027, 
+-1592850.00000000, -5154570.87796054, -5154570.87796054, -1592850.00000000, 
+4170135.43898027, 4170135.43898027, -1592850.00000000, -5154570.87796054, 
+1968870.87796054, 608414.561019730, -1592850.00000000, -1592850.00000000, 
+608414.561019729, 1968870.87796054, 6371400, 1968870.87796054, -5154570.87796054, 
+-5154570.87796054, 1968870.87796054, 6371400, 6371600, 1968932.68135942, 
+-5154732.68135941, -5154732.68135942, 1968932.68135941, 6371600, 
+1968932.68135942, 608433.659320293, -1592900, -1592900.00000000, 608433.659320292, 
+1968932.68135942, -5154732.68135941, -1592900.00000000, 4170266.34067971, 
+4170266.34067971, -1592900.00000000, -5154732.68135941, -5154732.68135942, 
+-1592900.00000000, 4170266.34067971, 4170266.34067971, -1592900.00000000, 
+-5154732.68135942, 1968932.68135941, 608433.659320292, -1592900.00000000, 
+-1592900.00000000, 608433.659320292, 1968932.68135941, 6371600, 1968932.68135942, 
+-5154732.68135941, -5154732.68135942, 1968932.68135941, 6371600, 6371800, 
+1968994.48475829, -5154894.48475829, -5154894.48475829, 1968994.48475829, 
+6371800, 1968994.48475829, 608452.757620855, -1592950, -1592950.00000000, 
+608452.757620855, 1968994.48475829, -5154894.48475829, -1592950, 4170397.24237914, 
+4170397.24237914, -1592950.00000000, -5154894.48475829, -5154894.48475829, 
+-1592950.00000000, 4170397.24237914, 4170397.24237915, -1592950.00000000, 
+-5154894.48475829, 1968994.48475829, 608452.757620855, -1592950.00000000, 
+-1592950.00000000, 608452.757620854, 1968994.48475829, 6371800, 1968994.48475829, 
+-5154894.48475829, -5154894.48475829, 1968994.48475829, 6371800, 6372000, 
+1969056.28815717, -5155056.28815716, -5155056.28815717, 1969056.28815716, 
+6372000, 1969056.28815717, 608471.855921418, -1593000, -1593000, 608471.855921417, 
+1969056.28815717, -5155056.28815716, -1593000.00000000, 4170528.14407858, 
+4170528.14407858, -1593000.00000000, -5155056.28815716, -5155056.28815717, 
+-1593000.00000000, 4170528.14407858, 4170528.14407858, -1593000.00000000, 
+-5155056.28815717, 1969056.28815716, 608471.855921417, -1593000.00000000, 
+-1593000.00000000, 608471.855921417, 1969056.28815716, 6372000, 1969056.28815717, 
+-5155056.28815716, -5155056.28815717, 1969056.28815716, 6372000};
+
+const double YSPHERE_MATLAB[216] = {0, 6059181.06531642, 3744779.84235535, 
+-3744779.84235535, -6059181.06531642, -1.56044495147356e-09, 0, 1872389.92117767, 
+1157200.61148054, -1157200.61148054, -1872389.92117767, -4.82204008791920e-10, 0, 
+-4901980.45383588, -3029590.53265821, 3029590.53265821, 4901980.45383588, 
+1.26242648452870e-09, 0, -4901980.45383589, -3029590.53265821, 3029590.53265821, 
+4901980.45383589, 1.26242648452870e-09, 0, 1872389.92117767, 1157200.61148054, 
+-1157200.61148054, -1872389.92117767, -4.82204008791919e-10, 0, 6059181.06531642, 
+3744779.84235535, -3744779.84235535, -6059181.06531642, -1.56044495147356e-09, 0, 
+6059371.27661968, 3744897.39940581, -3744897.39940580, -6059371.27661968, 
+-1.56049393734552e-09, 0, 1872448.69970290, 1157236.93860694, -1157236.93860694, 
+-1872448.69970290, -4.82219146258841e-10, 0, -4902134.33801274, -3029685.63830984, 
+3029685.63830984, 4902134.33801274, 1.26246611493160e-09, 0, -4902134.33801274, 
+-3029685.63830984, 3029685.63830984, 4902134.33801274, 1.26246611493160e-09, 0, 
+1872448.69970290, 1157236.93860694, -1157236.93860694, -1872448.69970290, 
+-4.82219146258841e-10, 0, 6059371.27661968, 3744897.39940581, -3744897.39940580, 
+-6059371.27661968, -1.56049393734552e-09, 0, 6059561.48792294, 3745014.95645626, 
+-3745014.95645626, -6059561.48792294, -1.56054292321749e-09, 0, 1872507.47822813, 
+1157273.26573334, -1157273.26573334, -1872507.47822813, -4.82234283725763e-10, 0, 
+-4902288.22218960, -3029780.74396147, 3029780.74396147, 4902288.22218960, 
+1.26250574533451e-09, 0, -4902288.22218960, -3029780.74396147, 3029780.74396147, 
+4902288.22218960, 1.26250574533451e-09, 0, 1872507.47822813, 1157273.26573334, 
+-1157273.26573334, -1872507.47822813, -4.82234283725763e-10, 0, 6059561.48792294, 
+3745014.95645626, -3745014.95645626, -6059561.48792294, -1.56054292321749e-09, 0, 
+6059751.69922620, 3745132.51350672, -3745132.51350672, -6059751.69922620, 
+-1.56059190908946e-09, 0, 1872566.25675336, 1157309.59285974, -1157309.59285974, 
+-1872566.25675336, -4.82249421192685e-10, 0, -4902442.10636646, -3029875.84961310, 
+3029875.84961310, 4902442.10636646, 1.26254537573741e-09, 0, -4902442.10636646, 
+-3029875.84961310, 3029875.84961310, 4902442.10636646, 1.26254537573741e-09, 0, 
+1872566.25675336, 1157309.59285974, -1157309.59285974, -1872566.25675336, 
+-4.82249421192684e-10, 0, 6059751.69922620, 3745132.51350672, -3745132.51350672, 
+-6059751.69922620, -1.56059190908946e-09, 0, 6059941.91052946, 3745250.07055718, 
+-3745250.07055718, -6059941.91052946, -1.56064089496142e-09, 0, 1872625.03527859, 
+1157345.91998614, -1157345.91998614, -1872625.03527859, -4.82264558659606e-10, 0, 
+-4902595.99054332, -3029970.95526473, 3029970.95526473, 4902595.99054332, 
+1.26258500614032e-09, 0, -4902595.99054332, -3029970.95526473, 3029970.95526473, 
+4902595.99054332, 1.26258500614032e-09, 0, 1872625.03527859, 1157345.91998614, 
+-1157345.91998614, -1872625.03527859, -4.82264558659606e-10, 0, 6059941.91052946, 
+3745250.07055718, -3745250.07055718, -6059941.91052946, -1.56064089496142e-09, 0, 
+6060132.12183272, 3745367.62760764, -3745367.62760764, -6060132.12183272, 
+-1.56068988083339e-09, 0, 1872683.81380382, 1157382.24711254, -1157382.24711254, 
+-1872683.81380382, -4.82279696126528e-10, 0, -4902749.87472018, -3030066.06091636, 
+3030066.06091636, 4902749.87472018, 1.26262463654322e-09, 0, -4902749.87472018, 
+-3030066.06091636, 3030066.06091636, 4902749.87472018, 1.26262463654322e-09, 0, 
+1872683.81380382, 1157382.24711254, -1157382.24711254, -1872683.81380382, 
+-4.82279696126528e-10, 0, 6060132.12183272, 3745367.62760764, -3745367.62760764, 
+-6060132.12183272, -1.56068988083339e-09};
+
+const double ZSPHERE_MATLAB[216] = {0, 0, 0, 0, 0, 0, 6059181.06531642, 
+6059181.06531642, 6059181.06531642, 6059181.06531642, 6059181.06531642, 
+6059181.06531642, 3744779.84235535, 3744779.84235535, 3744779.84235535, 
+3744779.84235535, 3744779.84235535, 3744779.84235535, -3744779.84235535, 
+-3744779.84235535, -3744779.84235535, -3744779.84235535, -3744779.84235535, 
+-3744779.84235535, -6059181.06531642, -6059181.06531642, -6059181.06531642, 
+-6059181.06531642, -6059181.06531642, -6059181.06531642, -1.56044495147356e-09, 
+-1.56044495147356e-09, -1.56044495147356e-09, -1.56044495147356e-09, 
+-1.56044495147356e-09, -1.56044495147356e-09, 0, 0, 0, 0, 0, 0, 6059371.27661968, 
+6059371.27661968, 6059371.27661968, 6059371.27661968, 6059371.27661968, 
+6059371.27661968, 3744897.39940581, 3744897.39940581, 3744897.39940581, 
+3744897.39940581, 3744897.39940581, 3744897.39940581, -3744897.39940580, 
+-3744897.39940580, -3744897.39940580, -3744897.39940580, -3744897.39940580, 
+-3744897.39940580, -6059371.27661968, -6059371.27661968, -6059371.27661968, 
+-6059371.27661968, -6059371.27661968, -6059371.27661968, -1.56049393734552e-09, 
+-1.56049393734552e-09, -1.56049393734552e-09, -1.56049393734552e-09, 
+-1.56049393734552e-09, -1.56049393734552e-09, 0, 0, 0, 0, 0, 0, 6059561.48792294, 
+6059561.48792294, 6059561.48792294, 6059561.48792294, 6059561.48792294, 
+6059561.48792294, 3745014.95645626, 3745014.95645626, 3745014.95645626, 
+3745014.95645626, 3745014.95645626, 3745014.95645626, -3745014.95645626, 
+-3745014.95645626, -3745014.95645626, -3745014.95645626, -3745014.95645626, 
+-3745014.95645626, -6059561.48792294, -6059561.48792294, -6059561.48792294, 
+-6059561.48792294, -6059561.48792294, -6059561.48792294, -1.56054292321749e-09, 
+-1.56054292321749e-09, -1.56054292321749e-09, -1.56054292321749e-09, 
+-1.56054292321749e-09, -1.56054292321749e-09, 0, 0, 0, 0, 0, 0, 6059751.69922620, 
+6059751.69922620, 6059751.69922620, 6059751.69922620, 6059751.69922620, 
+6059751.69922620, 3745132.51350672, 3745132.51350672, 3745132.51350672, 
+3745132.51350672, 3745132.51350672, 3745132.51350672, -3745132.51350672, 
+-3745132.51350672, -3745132.51350672, -3745132.51350672, -3745132.51350672, 
+-3745132.51350672, -6059751.69922620, -6059751.69922620, -6059751.69922620, 
+-6059751.69922620, -6059751.69922620, -6059751.69922620, -1.56059190908946e-09, 
+-1.56059190908946e-09, -1.56059190908946e-09, -1.56059190908946e-09, 
+-1.56059190908946e-09, -1.56059190908946e-09, 0, 0, 0, 0, 0, 0, 6059941.91052946, 
+6059941.91052946, 6059941.91052946, 6059941.91052946, 6059941.91052946, 
+6059941.91052946, 3745250.07055718, 3745250.07055718, 3745250.07055718, 
+3745250.07055718, 3745250.07055718, 3745250.07055718, -3745250.07055718, 
+-3745250.07055718, -3745250.07055718, -3745250.07055718, -3745250.07055718, 
+-3745250.07055718, -6059941.91052946, -6059941.91052946, -6059941.91052946, 
+-6059941.91052946, -6059941.91052946, -6059941.91052946, -1.56064089496142e-09, 
+-1.56064089496142e-09, -1.56064089496142e-09, -1.56064089496142e-09, 
+-1.56064089496142e-09, -1.56064089496142e-09, 0, 0, 0, 0, 0, 0, 6060132.12183272, 
+6060132.12183272, 6060132.12183272, 6060132.12183272, 6060132.12183272, 
+6060132.12183272, 3745367.62760764, 3745367.62760764, 3745367.62760764, 
+3745367.62760764, 3745367.62760764, 3745367.62760764, -3745367.62760764, 
+-3745367.62760764, -3745367.62760764, -3745367.62760764, -3745367.62760764, 
+-3745367.62760764, -6060132.12183272, -6060132.12183272, -6060132.12183272, 
+-6060132.12183272, -6060132.12183272, -6060132.12183272, -1.56068988083339e-09, 
+-1.56068988083339e-09, -1.56068988083339e-09, -1.56068988083339e-09, 
+-1.56068988083339e-09, -1.56068988083339e-09};
+
+const double XGRS80_MATLAB[216] = {6378137, 1970952.72545164, -5160021.22545164, 
+-5160021.22545164, 1970952.72545164, 6378137, 1976947.14312992, 610910.264208145, 
+-1599383.83577310, -1599383.83577310, 610910.264208145, 1976947.14312992, 
+-5165998.77753988, -1596381.41518003, 4179380.80394997, 4179380.80394997, 
+-1596381.41518003, -5165998.77753988, -5165998.77753988, -1596381.41518003, 
+4179380.80394997, 4179380.80394997, -1596381.41518003, -5165998.77753988, 
+1976947.14312991, 610910.264208145, -1599383.83577310, -1599383.83577310, 
+610910.264208145, 1976947.14312991, 6378137, 1970952.72545164, -5160021.22545164, 
+-5160021.22545164, 1970952.72545164, 6378137, 6378337, 1971014.52885052, 
+-5160183.02885052, -5160183.02885052, 1971014.52885052, 6378337, 1977008.94652879, 
+610929.362508708, -1599433.83577310, -1599433.83577310, 610929.362508708, 
+1977008.94652879, -5166160.58093876, -1596431.41518003, 4179511.70564940, 
+4179511.70564940, -1596431.41518003, -5166160.58093876, -5166160.58093876, 
+-1596431.41518003, 4179511.70564940, 4179511.70564940, -1596431.41518003, 
+-5166160.58093876, 1977008.94652879, 610929.362508708, -1599433.83577310, 
+-1599433.83577310, 610929.362508707, 1977008.94652879, 6378337, 1971014.52885052, 
+-5160183.02885052, -5160183.02885052, 1971014.52885052, 6378337, 6378537, 
+1971076.33224939, -5160344.83224939, -5160344.83224940, 1971076.33224939, 
+6378537, 1977070.74992767, 610948.460809271, -1599483.83577310, -1599483.83577310, 
+610948.460809270, 1977070.74992767, -5166322.38433763, -1596481.41518003, 
+4179642.60734884, 4179642.60734884, -1596481.41518003, -5166322.38433763, 
+-5166322.38433763, -1596481.41518003, 4179642.60734884, 4179642.60734884, 
+-1596481.41518003, -5166322.38433763, 1977070.74992766, 610948.460809270, 
+-1599483.83577310, -1599483.83577310, 610948.460809270, 1977070.74992766, 
+6378537, 1971076.33224939, -5160344.83224939, -5160344.83224940, 1971076.33224939, 
+6378537, 6378737, 1971138.13564827, -5160506.63564827, -5160506.63564827, 
+1971138.13564827, 6378737, 1977132.55332654, 610967.559109833, -1599533.83577310, 
+-1599533.83577310, 610967.559109833, 1977132.55332654, -5166484.18773651, 
+-1596531.41518003, 4179773.50904828, 4179773.50904828, -1596531.41518003, 
+-5166484.18773651, -5166484.18773651, -1596531.41518003, 4179773.50904828, 
+4179773.50904828, -1596531.41518003, -5166484.18773651, 1977132.55332654, 
+610967.559109833, -1599533.83577310, -1599533.83577310, 610967.559109832, 
+1977132.55332654, 6378737, 1971138.13564827, -5160506.63564827, -5160506.63564827, 
+1971138.13564827, 6378737, 6378937, 1971199.93904714, -5160668.43904714, 
+-5160668.43904714, 1971199.93904714, 6378937, 1977194.35672542, 610986.657410395, 
+-1599583.83577310, -1599583.83577310, 610986.657410395, 1977194.35672542, 
+-5166645.99113538, -1596581.41518003, 4179904.41074772, 4179904.41074772, 
+-1596581.41518003, -5166645.99113538, -5166645.99113538, -1596581.41518003, 
+4179904.41074772, 4179904.41074772, -1596581.41518003, -5166645.99113538, 
+1977194.35672541, 610986.657410395, -1599583.83577310, -1599583.83577310, 
+610986.657410395, 1977194.35672541, 6378937, 1971199.93904714, -5160668.43904714, 
+-5160668.43904714, 1971199.93904714, 6378937, 6379137, 1971261.74244602, 
+-5160830.24244602, -5160830.24244602, 1971261.74244602, 6379137, 1977256.16012429, 
+611005.755710958, -1599633.83577310, -1599633.83577310, 611005.755710958, 
+1977256.16012429, -5166807.79453425, -1596631.41518003, 4180035.31244715, 
+4180035.31244715, -1596631.41518003, -5166807.79453425, -5166807.79453426, 
+-1596631.41518003, 4180035.31244715, 4180035.31244715, -1596631.41518003, 
+-5166807.79453426, 1977256.16012429, 611005.755710958, -1599633.83577310, 
+-1599633.83577310, 611005.755710957, 1977256.16012429, 6379137, 1971261.74244602, 
+-5160830.24244602, -5160830.24244602, 1971261.74244602, 6379137};
+
+const double YGRS80_MATLAB[216] = {0, 6065968.75567322, 3748974.86570096, 
+-3748974.86570096, -6065968.75567322, -1.56219301231466e-09, 0, 1880188.46284479, 
+1162020.37529350, -1162020.37529350, -1880188.46284479, -4.84212398183511e-10, 0, 
+-4913156.80055210, -3036497.89479889, 3036497.89479889, 4913156.80055210, 
+1.26530477346267e-09, 0, -4913156.80055210, -3036497.89479889, 3036497.89479889, 
+4913156.80055210, 1.26530477346267e-09, 0, 1880188.46284479, 1162020.37529350, 
+-1162020.37529350, -1880188.46284479, -4.84212398183511e-10, 0, 6065968.75567322, 
+3748974.86570096, -3748974.86570096, -6065968.75567322, -1.56219301231466e-09, 0, 
+6066158.96697648, 3749092.42275142, -3749092.42275142, -6066158.96697648, 
+-1.56224199818663e-09, 0, 1880247.24137002, 1162056.70241990, -1162056.70241990, 
+-1880247.24137002, -4.84227535650433e-10, 0, -4913310.68472896, -3036593.00045052, 
+3036593.00045051, 4913310.68472896, 1.26534440386558e-09, 0, -4913310.68472896, 
+-3036593.00045052, 3036593.00045051, 4913310.68472896, 1.26534440386558e-09, 0, 
+1880247.24137002, 1162056.70241990, -1162056.70241990, -1880247.24137002, 
+-4.84227535650433e-10, 0, 6066158.96697648, 3749092.42275142, -3749092.42275142, 
+-6066158.96697648, -1.56224199818663e-09, 0, 6066349.17827974, 3749209.97980188, 
+-3749209.97980187, -6066349.17827974, -1.56229098405859e-09, 0, 1880306.01989525, 
+1162093.02954630, -1162093.02954630, -1880306.01989525, -4.84242673117355e-10, 0, 
+-4913464.56890582, -3036688.10610215, 3036688.10610214, 4913464.56890582, 
+1.26538403426848e-09, 0, -4913464.56890582, -3036688.10610215, 3036688.10610215, 
+4913464.56890582, 1.26538403426848e-09, 0, 1880306.01989525, 1162093.02954630, 
+-1162093.02954630, -1880306.01989525, -4.84242673117354e-10, 0, 6066349.17827974, 
+3749209.97980188, -3749209.97980187, -6066349.17827974, -1.56229098405859e-09, 0, 
+6066539.38958300, 3749327.53685233, -3749327.53685233, -6066539.38958300, 
+-1.56233996993056e-09, 0, 1880364.79842048, 1162129.35667270, -1162129.35667270, 
+-1880364.79842048, -4.84257810584276e-10, 0, -4913618.45308268, -3036783.21175378, 
+3036783.21175377, 4913618.45308268, 1.26542366467138e-09, 0, -4913618.45308268, 
+-3036783.21175378, 3036783.21175377, 4913618.45308268, 1.26542366467138e-09, 0, 
+1880364.79842048, 1162129.35667270, -1162129.35667270, -1880364.79842048, 
+-4.84257810584276e-10, 0, 6066539.38958300, 3749327.53685233, -3749327.53685233, 
+-6066539.38958300, -1.56233996993056e-09, 0, 6066729.60088626, 3749445.09390279, 
+-3749445.09390279, -6066729.60088626, -1.56238895580252e-09, 0, 1880423.57694571, 
+1162165.68379910, -1162165.68379910, -1880423.57694571, -4.84272948051198e-10, 0, 
+-4913772.33725954, -3036878.31740540, 3036878.31740540, 4913772.33725954, 
+1.26546329507429e-09, 0, -4913772.33725954, -3036878.31740541, 3036878.31740540, 
+4913772.33725954, 1.26546329507429e-09, 0, 1880423.57694571, 1162165.68379910, 
+-1162165.68379910, -1880423.57694571, -4.84272948051198e-10, 0, 6066729.60088626, 
+3749445.09390279, -3749445.09390279, -6066729.60088626, -1.56238895580252e-09, 0, 
+6066919.81218952, 3749562.65095325, -3749562.65095325, -6066919.81218952, 
+-1.56243794167449e-09, 0, 1880482.35547094, 1162202.01092550, -1162202.01092550, 
+-1880482.35547094, -4.84288085518120e-10, 0, -4913926.22143639, -3036973.42305703, 
+3036973.42305703, 4913926.22143639, 1.26550292547719e-09, 0, -4913926.22143639, 
+-3036973.42305703, 3036973.42305703, 4913926.22143639, 1.26550292547719e-09, 0, 
+1880482.35547094, 1162202.01092550, -1162202.01092550, -1880482.35547094, 
+-4.84288085518119e-10, 0, 6066919.81218952, 3749562.65095325, -3749562.65095325, 
+-6066919.81218952, -1.56243794167449e-09};
+
+const double ZGRS80_MATLAB[216] = {0, 0, 0, 0, 0, 0, 6043686.27213354, 
+6043686.27213354, 6043686.27213354, 6043686.27213354, 6043686.27213354, 
+6043686.27213354, 3728191.67572948, 3728191.67572948, 3728191.67572948, 
+3728191.67572948, 3728191.67572948, 3728191.67572948, -3728191.67572948, 
+-3728191.67572948, -3728191.67572948, -3728191.67572948, -3728191.67572948, 
+-3728191.67572948, -6043686.27213354, -6043686.27213354, -6043686.27213354, 
+-6043686.27213354, -6043686.27213354, -6043686.27213354, -1.55173509862111e-09, 
+-1.55173509862111e-09, -1.55173509862111e-09, -1.55173509862111e-09, 
+-1.55173509862111e-09, -1.55173509862111e-09, 0, 0, 0, 0, 0, 0, 6043876.48343680, 
+6043876.48343680, 6043876.48343680, 6043876.48343680, 6043876.48343680, 
+6043876.48343680, 3728309.23277994, 3728309.23277994, 3728309.23277994, 
+3728309.23277994, 3728309.23277994, 3728309.23277994, -3728309.23277994, 
+-3728309.23277994, -3728309.23277994, -3728309.23277994, -3728309.23277994, 
+-3728309.23277994, -6043876.48343680, -6043876.48343680, -6043876.48343680, 
+-6043876.48343680, -6043876.48343680, -6043876.48343680, -1.55178408449307e-09, 
+-1.55178408449307e-09, -1.55178408449307e-09, -1.55178408449307e-09, 
+-1.55178408449307e-09, -1.55178408449307e-09, 0, 0, 0, 0, 0, 0, 6044066.69474006, 
+6044066.69474006, 6044066.69474006, 6044066.69474006, 6044066.69474006, 
+6044066.69474006, 3728426.78983040, 3728426.78983040, 3728426.78983040, 
+3728426.78983040, 3728426.78983040, 3728426.78983040, -3728426.78983040, 
+-3728426.78983040, -3728426.78983040, -3728426.78983040, -3728426.78983040, 
+-3728426.78983040, -6044066.69474006, -6044066.69474006, -6044066.69474006, 
+-6044066.69474006, -6044066.69474006, -6044066.69474006, -1.55183307036504e-09, 
+-1.55183307036504e-09, -1.55183307036504e-09, -1.55183307036504e-09, 
+-1.55183307036504e-09, -1.55183307036504e-09, 0, 0, 0, 0, 0, 0, 6044256.90604332, 
+6044256.90604332, 6044256.90604332, 6044256.90604332, 6044256.90604332, 
+6044256.90604332, 3728544.34688086, 3728544.34688086, 3728544.34688086, 
+3728544.34688086, 3728544.34688086, 3728544.34688086, -3728544.34688086, 
+-3728544.34688086, -3728544.34688086, -3728544.34688086, -3728544.34688086, 
+-3728544.34688086, -6044256.90604332, -6044256.90604332, -6044256.90604332, 
+-6044256.90604332, -6044256.90604332, -6044256.90604332, -1.55188205623700e-09, 
+-1.55188205623700e-09, -1.55188205623700e-09, -1.55188205623700e-09, 
+-1.55188205623700e-09, -1.55188205623700e-09, 0, 0, 0, 0, 0, 0, 6044447.11734658, 
+6044447.11734658, 6044447.11734658, 6044447.11734658, 6044447.11734658, 
+6044447.11734658, 3728661.90393132, 3728661.90393132, 3728661.90393132, 
+3728661.90393132, 3728661.90393132, 3728661.90393132, -3728661.90393132, 
+-3728661.90393132, -3728661.90393132, -3728661.90393132, -3728661.90393132, 
+-3728661.90393132, -6044447.11734658, -6044447.11734658, -6044447.11734658, 
+-6044447.11734658, -6044447.11734658, -6044447.11734658, -1.55193104210897e-09, 
+-1.55193104210897e-09, -1.55193104210897e-09, -1.55193104210897e-09, 
+-1.55193104210897e-09, -1.55193104210897e-09, 0, 0, 0, 0, 0, 0, 6044637.32864983, 
+6044637.32864983, 6044637.32864983, 6044637.32864983, 6044637.32864983, 
+6044637.32864983, 3728779.46098178, 3728779.46098178, 3728779.46098178, 
+3728779.46098178, 3728779.46098178, 3728779.46098178, -3728779.46098177, 
+-3728779.46098177, -3728779.46098177, -3728779.46098177, -3728779.46098177, 
+-3728779.46098177, -6044637.32864983, -6044637.32864983, -6044637.32864983, 
+-6044637.32864983, -6044637.32864983, -6044637.32864983, -1.55198002798094e-09, 
+-1.55198002798094e-09, -1.55198002798094e-09, -1.55198002798094e-09, 
+-1.55198002798094e-09, -1.55198002798094e-09};
+
+const double XWGS84_MATLAB[216] = {6378137, 1970952.72545164, -5160021.22545164, 
+-5160021.22545164, 1970952.72545164, 6378137, 1976947.14310045, 610910.264199039, 
+-1599383.83574926, -1599383.83574926, 610910.264199039, 1976947.14310045, 
+-5165998.77751058, -1596381.41517097, 4179380.80392626, 4179380.80392626, 
+-1596381.41517097, -5165998.77751058, -5165998.77751058, -1596381.41517097, 
+4179380.80392626, 4179380.80392626, -1596381.41517097, -5165998.77751058, 
+1976947.14310045, 610910.264199039, -1599383.83574926, -1599383.83574926, 
+610910.264199039, 1976947.14310045, 6378137, 1970952.72545164, -5160021.22545164, 
+-5160021.22545164, 1970952.72545164, 6378137, 6378337, 1971014.52885052, 
+-5160183.02885052, -5160183.02885052, 1971014.52885052, 6378337, 1977008.94649932, 
+610929.362499602, -1599433.83574926, -1599433.83574926, 610929.362499601, 
+1977008.94649932, -5166160.58090945, -1596431.41517097, 4179511.70562570, 
+4179511.70562570, -1596431.41517097, -5166160.58090945, -5166160.58090945, 
+-1596431.41517097, 4179511.70562570, 4179511.70562570, -1596431.41517097, 
+-5166160.58090945, 1977008.94649932, 610929.362499601, -1599433.83574926, 
+-1599433.83574926, 610929.362499601, 1977008.94649932, 6378337, 1971014.52885052, 
+-5160183.02885052, -5160183.02885052, 1971014.52885052, 6378337, 6378537, 
+1971076.33224939, -5160344.83224939, -5160344.83224940, 1971076.33224939, 
+6378537, 1977070.74989820, 610948.460800164, -1599483.83574926, -1599483.83574926, 
+610948.460800164, 1977070.74989820, -5166322.38430833, -1596481.41517097, 
+4179642.60732513, 4179642.60732514, -1596481.41517097, -5166322.38430833, 
+-5166322.38430833, -1596481.41517097, 4179642.60732514, 4179642.60732514, 
+-1596481.41517097, -5166322.38430833, 1977070.74989820, 610948.460800164, 
+-1599483.83574926, -1599483.83574926, 610948.460800163, 1977070.74989820, 
+6378537, 1971076.33224939, -5160344.83224939, -5160344.83224940, 1971076.33224939, 
+6378537, 6378737, 1971138.13564827, -5160506.63564827, -5160506.63564827, 
+1971138.13564827, 6378737, 1977132.55329707, 610967.559100727, -1599533.83574926, 
+-1599533.83574926, 610967.559100726, 1977132.55329707, -5166484.18770720, 
+-1596531.41517097, 4179773.50902457, 4179773.50902457, -1596531.41517097, 
+-5166484.18770720, -5166484.18770720, -1596531.41517097, 4179773.50902457, 
+4179773.50902457, -1596531.41517097, -5166484.18770720, 1977132.55329707, 
+610967.559100726, -1599533.83574926, -1599533.83574926, 610967.559100726, 
+1977132.55329707, 6378737, 1971138.13564827, -5160506.63564827, -5160506.63564827, 
+1971138.13564827, 6378737, 6378937, 1971199.93904714, -5160668.43904714, 
+-5160668.43904714, 1971199.93904714, 6378937, 1977194.35669595, 610986.657401289, 
+-1599583.83574926, -1599583.83574926, 610986.657401289, 1977194.35669595, 
+-5166645.99110608, -1596581.41517097, 4179904.41072401, 4179904.41072401, 
+-1596581.41517097, -5166645.99110608, -5166645.99110608, -1596581.41517097, 
+4179904.41072401, 4179904.41072401, -1596581.41517097, -5166645.99110608, 
+1977194.35669595, 610986.657401289, -1599583.83574926, -1599583.83574926, 
+610986.657401288, 1977194.35669595, 6378937, 1971199.93904714, -5160668.43904714, 
+-5160668.43904714, 1971199.93904714, 6378937, 6379137, 1971261.74244602, 
+-5160830.24244602, -5160830.24244602, 1971261.74244602, 6379137, 1977256.16009482, 
+611005.755701852, -1599633.83574926, -1599633.83574926, 611005.755701851, 
+1977256.16009482, -5166807.79450495, -1596631.41517097, 4180035.31242345, 
+4180035.31242345, -1596631.41517097, -5166807.79450495, -5166807.79450495, 
+-1596631.41517097, 4180035.31242345, 4180035.31242345, -1596631.41517097, 
+-5166807.79450495, 1977256.16009482, 611005.755701851, -1599633.83574926, 
+-1599633.83574926, 611005.755701851, 1977256.16009482, 6379137, 1971261.74244602, 
+-5160830.24244602, -5160830.24244602, 1971261.74244602, 6379137};
+
+const double YWGS84_MATLAB[216] = {0, 6065968.75567322, 3748974.86570096, 
+-3748974.86570096, -6065968.75567322, -1.56219301231466e-09, 0, 1880188.46281677, 
+1162020.37527618, -1162020.37527618, -1880188.46281677, -4.84212398176294e-10, 0, 
+-4913156.80052423, -3036497.89478166, 3036497.89478166, 4913156.80052423, 
+1.26530477345549e-09, 0, -4913156.80052423, -3036497.89478166, 3036497.89478166, 
+4913156.80052423, 1.26530477345549e-09, 0, 1880188.46281677, 1162020.37527618, 
+-1162020.37527618, -1880188.46281677, -4.84212398176293e-10, 0, 6065968.75567322, 
+3748974.86570096, -3748974.86570096, -6065968.75567322, -1.56219301231466e-09, 0, 
+6066158.96697648, 3749092.42275142, -3749092.42275142, -6066158.96697648, 
+-1.56224199818663e-09, 0, 1880247.24134200, 1162056.70240258, -1162056.70240258, 
+-1880247.24134200, -4.84227535643215e-10, 0, -4913310.68470109, -3036593.00043329, 
+3036593.00043329, 4913310.68470109, 1.26534440385840e-09, 0, -4913310.68470109, 
+-3036593.00043329, 3036593.00043329, 4913310.68470109, 1.26534440385840e-09, 0, 
+1880247.24134200, 1162056.70240258, -1162056.70240258, -1880247.24134200, 
+-4.84227535643215e-10, 0, 6066158.96697648, 3749092.42275142, -3749092.42275142, 
+-6066158.96697648, -1.56224199818663e-09, 0, 6066349.17827974, 3749209.97980188, 
+-3749209.97980187, -6066349.17827974, -1.56229098405859e-09, 0, 1880306.01986723, 
+1162093.02952898, -1162093.02952898, -1880306.01986723, -4.84242673110137e-10, 0, 
+-4913464.56887795, -3036688.10608492, 3036688.10608492, 4913464.56887795, 
+1.26538403426130e-09, 0, -4913464.56887795, -3036688.10608492, 3036688.10608492, 
+4913464.56887795, 1.26538403426130e-09, 0, 1880306.01986722, 1162093.02952898, 
+-1162093.02952898, -1880306.01986723, -4.84242673110137e-10, 0, 6066349.17827974, 
+3749209.97980188, -3749209.97980187, -6066349.17827974, -1.56229098405859e-09, 0, 
+6066539.38958300, 3749327.53685233, -3749327.53685233, -6066539.38958300, 
+-1.56233996993056e-09, 0, 1880364.79839246, 1162129.35665538, -1162129.35665538, 
+-1880364.79839246, -4.84257810577059e-10, 0, -4913618.45305481, -3036783.21173655, 
+3036783.21173655, 4913618.45305481, 1.26542366466421e-09, 0, -4913618.45305481, 
+-3036783.21173655, 3036783.21173655, 4913618.45305481, 1.26542366466421e-09, 0, 
+1880364.79839245, 1162129.35665538, -1162129.35665538, -1880364.79839245, 
+-4.84257810577058e-10, 0, 6066539.38958300, 3749327.53685233, -3749327.53685233, 
+-6066539.38958300, -1.56233996993056e-09, 0, 6066729.60088626, 3749445.09390279, 
+-3749445.09390279, -6066729.60088626, -1.56238895580252e-09, 0, 1880423.57691768, 
+1162165.68378178, -1162165.68378178, -1880423.57691768, -4.84272948043980e-10, 0, 
+-4913772.33723167, -3036878.31738818, 3036878.31738818, 4913772.33723167, 
+1.26546329506711e-09, 0, -4913772.33723167, -3036878.31738818, 3036878.31738818, 
+4913772.33723167, 1.26546329506711e-09, 0, 1880423.57691768, 1162165.68378178, 
+-1162165.68378178, -1880423.57691768, -4.84272948043980e-10, 0, 6066729.60088626, 
+3749445.09390279, -3749445.09390279, -6066729.60088626, -1.56238895580252e-09, 0, 
+6066919.81218952, 3749562.65095325, -3749562.65095325, -6066919.81218952, 
+-1.56243794167449e-09, 0, 1880482.35544291, 1162202.01090818, -1162202.01090818, 
+-1880482.35544291, -4.84288085510902e-10, 0, -4913926.22140853, -3036973.42303981, 
+3036973.42303981, 4913926.22140853, 1.26550292547002e-09, 0, -4913926.22140853, 
+-3036973.42303981, 3036973.42303981, 4913926.22140853, 1.26550292547002e-09, 0, 
+1880482.35544291, 1162202.01090818, -1162202.01090818, -1880482.35544291, 
+-4.84288085510902e-10, 0, 6066919.81218952, 3749562.65095325, -3749562.65095325, 
+-6066919.81218952, -1.56243794167449e-09};
+
+const double ZWGS84_MATLAB[216] = {0, 0, 0, 0, 0, 0, 6043686.27224277, 
+6043686.27224277, 6043686.27224277, 6043686.27224277, 6043686.27224277, 
+6043686.27224277, 3728191.67583129, 3728191.67583129, 3728191.67583129, 
+3728191.67583129, 3728191.67583129, 3728191.67583129, -3728191.67583129, 
+-3728191.67583129, -3728191.67583129, -3728191.67583129, -3728191.67583129, 
+-3728191.67583129, -6043686.27224277, -6043686.27224277, -6043686.27224277, 
+-6043686.27224277, -6043686.27224277, -6043686.27224277, -1.55173509867228e-09, 
+-1.55173509867228e-09, -1.55173509867228e-09, -1.55173509867228e-09, 
+-1.55173509867228e-09, -1.55173509867228e-09, 0, 0, 0, 0, 0, 0, 6043876.48354603, 
+6043876.48354603, 6043876.48354603, 6043876.48354603, 6043876.48354603, 
+6043876.48354603, 3728309.23288175, 3728309.23288175, 3728309.23288175, 
+3728309.23288175, 3728309.23288175, 3728309.23288175, -3728309.23288175, 
+-3728309.23288175, -3728309.23288175, -3728309.23288175, -3728309.23288175, 
+-3728309.23288175, -6043876.48354603, -6043876.48354603, -6043876.48354603, 
+-6043876.48354603, -6043876.48354603, -6043876.48354603, -1.55178408454425e-09, 
+-1.55178408454425e-09, -1.55178408454425e-09, -1.55178408454425e-09, 
+-1.55178408454425e-09, -1.55178408454425e-09, 0, 0, 0, 0, 0, 0, 6044066.69484929, 
+6044066.69484929, 6044066.69484929, 6044066.69484929, 6044066.69484929, 
+6044066.69484929, 3728426.78993221, 3728426.78993221, 3728426.78993221, 
+3728426.78993221, 3728426.78993221, 3728426.78993221, -3728426.78993221, 
+-3728426.78993221, -3728426.78993221, -3728426.78993221, -3728426.78993221, 
+-3728426.78993221, -6044066.69484929, -6044066.69484929, -6044066.69484929, 
+-6044066.69484929, -6044066.69484929, -6044066.69484929, -1.55183307041621e-09, 
+-1.55183307041621e-09, -1.55183307041621e-09, -1.55183307041621e-09, 
+-1.55183307041621e-09, -1.55183307041621e-09, 0, 0, 0, 0, 0, 0, 6044256.90615255, 
+6044256.90615255, 6044256.90615255, 6044256.90615255, 6044256.90615255, 
+6044256.90615255, 3728544.34698267, 3728544.34698267, 3728544.34698267, 
+3728544.34698267, 3728544.34698267, 3728544.34698267, -3728544.34698267, 
+-3728544.34698267, -3728544.34698267, -3728544.34698267, -3728544.34698267, 
+-3728544.34698267, -6044256.90615255, -6044256.90615255, -6044256.90615255, 
+-6044256.90615255, -6044256.90615255, -6044256.90615255, -1.55188205628818e-09, 
+-1.55188205628818e-09, -1.55188205628818e-09, -1.55188205628818e-09, 
+-1.55188205628818e-09, -1.55188205628818e-09, 0, 0, 0, 0, 0, 0, 6044447.11745581, 
+6044447.11745581, 6044447.11745581, 6044447.11745581, 6044447.11745581, 
+6044447.11745581, 3728661.90403313, 3728661.90403313, 3728661.90403313, 
+3728661.90403313, 3728661.90403313, 3728661.90403313, -3728661.90403313, 
+-3728661.90403313, -3728661.90403313, -3728661.90403313, -3728661.90403313, 
+-3728661.90403313, -6044447.11745581, -6044447.11745581, -6044447.11745581, 
+-6044447.11745581, -6044447.11745581, -6044447.11745581, -1.55193104216015e-09, 
+-1.55193104216015e-09, -1.55193104216015e-09, -1.55193104216015e-09, 
+-1.55193104216015e-09, -1.55193104216015e-09, 0, 0, 0, 0, 0, 0, 6044637.32875907, 
+6044637.32875907, 6044637.32875907, 6044637.32875907, 6044637.32875907, 
+6044637.32875907, 3728779.46108359, 3728779.46108359, 3728779.46108359, 
+3728779.46108359, 3728779.46108359, 3728779.46108359, -3728779.46108358, 
+-3728779.46108358, -3728779.46108358, -3728779.46108358, -3728779.46108358, 
+-3728779.46108358, -6044637.32875907, -6044637.32875907, -6044637.32875907, 
+-6044637.32875907, -6044637.32875907, -6044637.32875907, -1.55198002803211e-09, 
+-1.55198002803211e-09, -1.55198002803211e-09, -1.55198002803211e-09, 
+-1.55198002803211e-09, -1.55198002803211e-09};
+
+
+class GeoToCartesianTestCase : public TestCase
+{
+public:
+  GeoToCartesianTestCase (double latitude, 
+                          double longitude, 
+                          double altitude,
+                          GeographicPositions::EarthSpheroidType sphType,
+                          int i);
+  virtual ~GeoToCartesianTestCase ();
+
+private:
+  virtual void DoRun (void);
+  static std::string Name (double latitude, 
+                           double longitude, 
+                           double altitude,
+                           GeographicPositions::EarthSpheroidType sphType);
+  double m_latitude;
+  double m_longitude;
+  double m_altitude;
+  GeographicPositions::EarthSpheroidType m_sphType;
+  int m_i;
+};
+
+std::string 
+GeoToCartesianTestCase::Name (double latitude, 
+                              double longitude, 
+                              double altitude,
+                              GeographicPositions::EarthSpheroidType sphType)
+{
+  std::ostringstream oss;
+  oss << "latitude = " << latitude << " degrees, "
+      << "longitude = " << longitude << " degrees, "
+      << "altitude = " << altitude << " meters, "
+      << "earth spheroid type = " << sphType;
+  return oss.str();
+}
+
+GeoToCartesianTestCase::GeoToCartesianTestCase (double latitude, 
+                                                double longitude, 
+                                                double altitude,
+                                                GeographicPositions::EarthSpheroidType sphType,
+                                                int i)
+  : TestCase (Name (latitude, longitude, altitude, sphType)),
+    m_latitude (latitude),
+    m_longitude (longitude),
+    m_altitude (altitude),
+    m_sphType (sphType),
+    m_i (i)
+{
+}
+
+GeoToCartesianTestCase::~GeoToCartesianTestCase ()
+{
+}
+
+void
+GeoToCartesianTestCase::DoRun (void)
+{  
+  Vector cart = GeographicPositions::GeographicToCartesianCoordinates (m_latitude, 
+                                                                       m_longitude, 
+                                                                       m_altitude,
+                                                                       m_sphType);
+  if (m_sphType == GeographicPositions::SPHERE)
+    {
+      NS_TEST_ASSERT_MSG_EQ_TOL (cart.x, 
+                                 XSPHERE_MATLAB [m_i], 
+                                 TOLERANCE, 
+                                 "x coordinate (" << cart.x << ") is incorrect "
+                                 "for perfect sphere model in iteration " << m_i);
+      NS_TEST_ASSERT_MSG_EQ_TOL (cart.y, 
+                                 YSPHERE_MATLAB [m_i], 
+                                 TOLERANCE, 
+                                 "y coordinate (" << cart.y << ") is incorrect "
+                                 "for perfect sphere model in iteration " << m_i);
+      NS_TEST_ASSERT_MSG_EQ_TOL (cart.z, 
+                                 ZSPHERE_MATLAB [m_i], 
+                                 TOLERANCE, 
+                                 "z coordinate (" << cart.z << ") is incorrect "
+                                 "for perfect sphere model in iteration " << m_i);
+    }
+  else if (m_sphType == GeographicPositions::GRS80)
+    {
+      NS_TEST_ASSERT_MSG_EQ_TOL (cart.x, 
+                                 XGRS80_MATLAB [m_i], 
+                                 TOLERANCE, 
+                                 "x coordinate (" << cart.x << ") is incorrect "
+                                 "for GRS80 model in iteration " << m_i);
+      NS_TEST_ASSERT_MSG_EQ_TOL (cart.y, 
+                                 YGRS80_MATLAB [m_i], 
+                                 TOLERANCE, 
+                                 "y coordinate (" << cart.y << ") is incorrect "
+                                 "for GRS80 model in iteration " << m_i);
+      NS_TEST_ASSERT_MSG_EQ_TOL (cart.z, 
+                                 ZGRS80_MATLAB [m_i], 
+                                 TOLERANCE, 
+                                 "z coordinate (" << cart.z << ") is incorrect "
+                                 "for GRS80 model in iteration " << m_i);
+    }
+  else // if m_sphType == GeographicPositions::WGS84
+    {
+      NS_TEST_ASSERT_MSG_EQ_TOL (cart.x, 
+                                 XWGS84_MATLAB [m_i], 
+                                 TOLERANCE, 
+                                 "x coordinate (" << cart.x << ") is incorrect "
+                                 "for WGS84 model in iteration " << m_i);
+      NS_TEST_ASSERT_MSG_EQ_TOL (cart.y, 
+                                 YWGS84_MATLAB [m_i], 
+                                 TOLERANCE, 
+                                 "y coordinate (" << cart.y << ") is incorrect "
+                                 "for WGS84 model in iteration " << m_i);
+      NS_TEST_ASSERT_MSG_EQ_TOL (cart.z, 
+                                 ZWGS84_MATLAB [m_i], 
+                                 TOLERANCE, 
+                                 "z coordinate (" << cart.z << ") is incorrect "
+                                 "for WGS84 model in iteration " << m_i);
+    }
+}
+
+
+class GeoToCartesianTestSuite : public TestSuite
+{
+public:
+  GeoToCartesianTestSuite ();
+};
+
+GeoToCartesianTestSuite::GeoToCartesianTestSuite ()
+  : TestSuite ("geo-to-cartesian", UNIT)
+{
+  NS_LOG_INFO ("creating GeoToCartesianTestSuite");
+  int i = 0; // iteration number
+  for (double altitude = 0; altitude <= 1000; altitude += 200)
+    {
+      for (double latitude = 0; latitude <= 360; latitude += 72)
+        {
+          for (double longitude = 0; longitude <= 360; longitude += 72)
+            {
+              AddTestCase (new GeoToCartesianTestCase (latitude, 
+                                                       longitude, 
+                                                       altitude, 
+                                                       GeographicPositions::SPHERE,
+                                                       i), 
+                           TestCase::QUICK);
+              ++i;
+            }
+        }
+    }
+  i = 0;
+  for (double altitude = 0; altitude <= 1000; altitude += 200)
+    {
+      for (double latitude = 0; latitude <= 360; latitude += 72)
+        {
+          for (double longitude = 0; longitude <= 360; longitude += 72)
+            {
+              AddTestCase (new GeoToCartesianTestCase (latitude, 
+                                                       longitude, 
+                                                       altitude, 
+                                                       GeographicPositions::GRS80,
+                                                       i), 
+                           TestCase::QUICK);
+              ++i;
+            }
+        }
+    }
+  i = 0;
+  for (double altitude = 0; altitude <= 1000; altitude += 200)
+    {
+      for (double latitude = 0; latitude <= 360; latitude += 72)
+        {
+          for (double longitude = 0; longitude <= 360; longitude += 72)
+            {
+              AddTestCase (new GeoToCartesianTestCase (latitude, 
+                                                       longitude, 
+                                                       altitude, 
+                                                       GeographicPositions::WGS84,
+                                                       i), 
+                           TestCase::QUICK);
+              ++i;
+            }
+        }
+    }
+}
+
+static GeoToCartesianTestSuite g_GeoToCartesianTestSuite;
diff -Naur ns-3.22/src/mobility/test/rand-cart-around-geo-test.cc ns-3.23/src/mobility/test/rand-cart-around-geo-test.cc
--- ns-3.22/src/mobility/test/rand-cart-around-geo-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/mobility/test/rand-cart-around-geo-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -0,0 +1,177 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#include <ns3/test.h>
+#include <ns3/log.h>
+#include <cmath>
+#include <ns3/geographic-positions.h>
+
+/**
+ * This test verifies the accuracy of the RandCartesianPointsAroundGeographicPoint()
+ * method in the GeographicPositions class, which generates uniformly 
+ * distributed random points (in ECEF Cartesian coordinates) within a given 
+ * altitude above earth's surface centered around a given origin point (on 
+ * earth's surface, in geographic/geodetic coordinates) within a given distance 
+ * radius (using arc length of earth's surface, not pythagorean distance).
+ * Distance radius is measured as if all generated points are on earth's 
+ * surface (with altitude = 0). Assumes earth is a perfect sphere. To verify the 
+ * method, this test checks that the generated points are within the given 
+ * maximum distance radius from the origin. Since this is testing the distance 
+ * radius from the origin, all points generated in this test are on earth's 
+ * surface (altitude = 0), since the distance radius has been defined as if all 
+ * points are on earth's surface. The pythagorean (straight-line) distance 
+ * between each generated point and the origin is first calculated, and then 
+ * using this distance and the radius of the earth, the distance radius to the
+ * origin (arc length) is calculated. This distance radius is compared to the 
+ * max distance radius to ensure that it is less than the maximum.
+ */
+NS_LOG_COMPONENT_DEFINE ("RandCartAroundGeoTest");
+
+using namespace ns3;
+
+// 0.1 meter tolerance for testing, which is very small compared to the maximum 
+// distances from origin being tested
+const double TOLERANCE = 0.1;
+
+// earth's radius in meters if modeled as a perfect sphere
+static const double EARTH_RADIUS = 6371e3; 
+
+class RandCartAroundGeoTestCase : public TestCase
+{
+public:
+  RandCartAroundGeoTestCase (double originLatitude, 
+                             double originLongitude,
+                             double maxAltitude, 
+                             int numPoints, 
+                             double maxDistFromOrigin,
+                             Ptr<UniformRandomVariable> uniRand);
+  virtual ~RandCartAroundGeoTestCase ();
+
+private:
+  virtual void DoRun (void);
+  static std::string Name (double originLatitude, 
+                           double originLongitude,
+                           double maxDistFromOrigin);
+  double m_originLatitude;
+  double m_originLongitude;
+  double m_maxAltitude;
+  int m_numPoints;
+  double m_maxDistFromOrigin;
+  Ptr<UniformRandomVariable> m_uniRand;
+};
+
+std::string 
+RandCartAroundGeoTestCase::Name (double originLatitude, 
+                                 double originLongitude,
+                                 double maxDistFromOrigin)
+{
+  std::ostringstream oss;
+  oss << "origin latitude = " << originLatitude << " degrees, "
+      << "origin longitude = " << originLongitude << " degrees, "
+      << "max distance from origin = " << maxDistFromOrigin;
+  return oss.str();
+}
+
+RandCartAroundGeoTestCase::RandCartAroundGeoTestCase (double originLatitude, 
+                                                      double originLongitude,
+                                                      double maxAltitude, 
+                                                      int numPoints, 
+                                                      double maxDistFromOrigin,
+                                                      Ptr<UniformRandomVariable> uniRand)
+  : TestCase (Name (originLatitude, originLongitude, maxDistFromOrigin)),
+    m_originLatitude (originLatitude),
+    m_originLongitude (originLongitude),
+    m_maxAltitude (maxAltitude),
+    m_numPoints (numPoints),
+    m_maxDistFromOrigin (maxDistFromOrigin),
+    m_uniRand (uniRand)
+{
+}
+
+RandCartAroundGeoTestCase::~RandCartAroundGeoTestCase ()
+{
+}
+
+void
+RandCartAroundGeoTestCase::DoRun (void)
+{  
+  std::list<Vector> points =  GeographicPositions::RandCartesianPointsAroundGeographicPoint (m_originLatitude, 
+                                                                                             m_originLongitude,
+                                                                                             m_maxAltitude, 
+                                                                                             m_numPoints, 
+                                                                                             m_maxDistFromOrigin,
+                                                                                             m_uniRand);
+  Vector origin = GeographicPositions::GeographicToCartesianCoordinates (m_originLatitude, 
+                                                                         m_originLongitude, 
+                                                                         m_maxAltitude,
+                                                                         GeographicPositions::SPHERE);
+  Vector randPoint;
+  while (!points.empty ())
+    {
+      randPoint = points.front ();
+      points.pop_front ();
+
+      // pythagorean distance between random point and origin, not distance on surface of earth
+      double straightDistFromOrigin = sqrt (pow (randPoint.x - origin.x, 2) + 
+                                            pow (randPoint.y - origin.y, 2) + 
+                                            pow (randPoint.z - origin.z, 2));
+
+      // arc length distance between random point and origin, on surface of earth
+      double arcDistFromOrigin = 2 * EARTH_RADIUS * asin (straightDistFromOrigin / (2 * EARTH_RADIUS));
+
+      NS_TEST_ASSERT_MSG_LT (arcDistFromOrigin, 
+                             m_maxDistFromOrigin + TOLERANCE,  
+                             "random point (" << randPoint.x << ", " << randPoint.y 
+                             << ", " << randPoint.z << ") is outside of max radius from origin");
+    }
+}
+
+
+class RandCartAroundGeoTestSuite : public TestSuite
+{
+public:
+  RandCartAroundGeoTestSuite ();
+};
+
+RandCartAroundGeoTestSuite::RandCartAroundGeoTestSuite ()
+  : TestSuite ("rand-cart-around-geo", UNIT)
+{
+  NS_LOG_INFO ("creating RandCartAroundGeoTestSuite");
+  Ptr<UniformRandomVariable> uniRand = CreateObject<UniformRandomVariable> ();
+  uniRand->SetStream (5);
+  for (double originLatitude = -89.9; originLatitude <= 89.9; originLatitude += 35.96)
+    {
+      for (double originLongitude = 0; originLongitude <= 360; originLongitude += 72)
+        {
+          for (double maxDistFromOrigin = 1000; maxDistFromOrigin <= 1000000; maxDistFromOrigin *= 10)
+            {
+              AddTestCase (new RandCartAroundGeoTestCase (originLatitude, 
+                                                          originLongitude, 
+                                                          0, // on earth's surface
+                                                          50, // 50 points generated
+                                                          maxDistFromOrigin,
+                                                          uniRand), 
+                           TestCase::QUICK);
+            }
+        }
+    }
+}
+
+static RandCartAroundGeoTestSuite g_RandCartAroundGeoTestSuite;
diff -Naur ns-3.22/src/mobility/wscript ns-3.23/src/mobility/wscript
--- ns-3.22/src/mobility/wscript	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mobility/wscript	2015-05-13 11:05:27.000000000 -0700
@@ -9,6 +9,7 @@
         'model/constant-velocity-helper.cc',
         'model/constant-velocity-mobility-model.cc',
         'model/gauss-markov-mobility-model.cc',
+        'model/geographic-positions.cc',
         'model/hierarchical-mobility-model.cc',
         'model/mobility-model.cc',
         'model/position-allocator.cc',
@@ -30,6 +31,8 @@
         'test/ns2-mobility-helper-test-suite.cc',
         'test/steady-state-random-waypoint-mobility-model-test.cc',
         'test/waypoint-mobility-model-test.cc',
+        'test/geo-to-cartesian-test.cc',
+        'test/rand-cart-around-geo-test.cc',
         ]
 
     headers = bld(features='ns3header')
@@ -41,6 +44,7 @@
         'model/constant-velocity-helper.h',
         'model/constant-velocity-mobility-model.h',
         'model/gauss-markov-mobility-model.h',
+        'model/geographic-positions.h',
         'model/hierarchical-mobility-model.h',
         'model/mobility-model.h',
         'model/position-allocator.h',
diff -Naur ns-3.22/src/mpi/model/distributed-simulator-impl.cc ns-3.23/src/mpi/model/distributed-simulator-impl.cc
--- ns-3.22/src/mpi/model/distributed-simulator-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mpi/model/distributed-simulator-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -83,6 +83,7 @@
 {
   static TypeId tid = TypeId ("ns3::DistributedSimulatorImpl")
     .SetParent<Object> ()
+    .SetGroupName ("Mpi")
     .AddConstructor<DistributedSimulatorImpl> ()
   ;
   return tid;
diff -Naur ns-3.22/src/mpi/model/granted-time-window-mpi-interface.cc ns-3.23/src/mpi/model/granted-time-window-mpi-interface.cc
--- ns-3.22/src/mpi/model/granted-time-window-mpi-interface.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mpi/model/granted-time-window-mpi-interface.cc	2015-05-13 11:05:27.000000000 -0700
@@ -93,6 +93,7 @@
 {
   static TypeId tid = TypeId ("ns3::GrantedTimeWindowMpiInterface")
     .SetParent<Object> ()
+    .SetGroupName ("Mpi")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/mpi/model/mpi-receiver.cc ns-3.23/src/mpi/model/mpi-receiver.cc
--- ns-3.22/src/mpi/model/mpi-receiver.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mpi/model/mpi-receiver.cc	2015-05-13 11:05:27.000000000 -0700
@@ -25,6 +25,7 @@
 {
   static TypeId tid = TypeId ("ns3::MpiReceiver")
     .SetParent<Object> ()
+    .SetGroupName ("Mpi")
     .AddConstructor <MpiReceiver> ();
   return tid;
 }
diff -Naur ns-3.22/src/mpi/model/null-message-simulator-impl.cc ns-3.23/src/mpi/model/null-message-simulator-impl.cc
--- ns-3.22/src/mpi/model/null-message-simulator-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mpi/model/null-message-simulator-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -55,6 +55,7 @@
 {
   static TypeId tid = TypeId ("ns3::NullMessageSimulatorImpl")
     .SetParent<Object> ()
+    .SetGroupName ("Mpi")
     .AddConstructor<NullMessageSimulatorImpl> ()
     .AddAttribute ("SchedulerTune", "Null Message scheduler tuning parameter",
                    DoubleValue (1.0),
diff -Naur ns-3.22/src/mpi/model/remote-channel-bundle.cc ns-3.23/src/mpi/model/remote-channel-bundle.cc
--- ns-3.22/src/mpi/model/remote-channel-bundle.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/mpi/model/remote-channel-bundle.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::RemoteChannelBundle")
     .SetParent<Object> ()
+    .SetGroupName ("Mpi")
     .AddConstructor <RemoteChannelBundle> ();
   return tid;
 }
diff -Naur ns-3.22/src/netanim/model/animation-interface.cc ns-3.23/src/netanim/model/animation-interface.cc
--- ns-3.22/src/netanim/model/animation-interface.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/netanim/model/animation-interface.cc	2015-05-13 11:05:27.000000000 -0700
@@ -1,6 +1,4 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
+/* -*- Mode:C++; c-file-style:"gnu"; indeni * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation;
  *
@@ -773,7 +771,8 @@
   ++gAnimUid;
   NS_LOG_INFO ("Uan TxBeginTrace for packet:" << gAnimUid);
   AddByteTag (gAnimUid, p);
-  AnimPacketInfo pktInfo (ndev, Simulator::Now (), Simulator::Now (), UpdatePosition (n));
+  UpdatePosition (n);
+  AnimPacketInfo pktInfo (ndev, Simulator::Now ());
   AddPendingPacket (AnimationInterface::UAN, gAnimUid, pktInfo);
   OutputWirelessPacketTxInfo (p, m_pendingUanPackets[gAnimUid], gAnimUid);
 }
@@ -794,9 +793,9 @@
       NS_LOG_WARN ("UanPhyGenRxBeginTrace: unknown Uid");
       return;
     }
-  m_pendingUanPackets[animUid].ProcessRxBegin (ndev, Simulator::Now ());
-  m_pendingUanPackets[animUid].ProcessRxEnd (ndev, Simulator::Now (), UpdatePosition (n));
-  OutputWirelessPacketRxInfo (p, m_pendingUanPackets[animUid].GetRxInfo (ndev), animUid);
+  UpdatePosition (n);
+  m_pendingUanPackets[animUid].ProcessRxBegin (ndev, Simulator::Now ().GetSeconds ());
+  OutputWirelessPacketRxInfo (p, m_pendingUanPackets[animUid], animUid);
 }
 
 
@@ -813,7 +812,8 @@
   ++gAnimUid;
   NS_LOG_INFO ("Wifi TxBeginTrace for packet:" << gAnimUid);
   AddByteTag (gAnimUid, p);
-  AnimPacketInfo pktInfo (ndev, Simulator::Now (), Simulator::Now (), UpdatePosition (n));
+  UpdatePosition (n);
+  AnimPacketInfo pktInfo (ndev, Simulator::Now ());
   AddPendingPacket (AnimationInterface::WIFI, gAnimUid, pktInfo);
   Ptr<WifiNetDevice> netDevice = DynamicCast<WifiNetDevice> (ndev);
   Mac48Address nodeAddr = netDevice->GetMac ()->GetAddress ();
@@ -855,14 +855,15 @@
         return;
       }
       Ptr <Node> txNode = NodeList::GetNode (m_macToNodeIdMap[oss.str ()]);
-      AnimPacketInfo pktInfo (0, Simulator::Now (), Simulator::Now (), UpdatePosition (txNode), m_macToNodeIdMap[oss.str ()]);
+      UpdatePosition (txNode);
+      AnimPacketInfo pktInfo (0, Simulator::Now (), m_macToNodeIdMap[oss.str ()]);
       AddPendingPacket (AnimationInterface::WIFI, animUid, pktInfo);
       NS_LOG_WARN ("WifiPhyRxBegin: unknown Uid, but we are adding a wifi packet");
     }
   /// \todo NS_ASSERT (WifiPacketIsPending (animUid) == true);
-  m_pendingWifiPackets[animUid].ProcessRxBegin (ndev, Simulator::Now ());
-  m_pendingWifiPackets[animUid].ProcessRxEnd (ndev, Simulator::Now (), UpdatePosition (n));
-  OutputWirelessPacketRxInfo (p, m_pendingWifiPackets[animUid].GetRxInfo (ndev), animUid);
+  UpdatePosition (n);
+  m_pendingWifiPackets[animUid].ProcessRxBegin (ndev, Simulator::Now ().GetSeconds ());
+  OutputWirelessPacketRxInfo (p, m_pendingWifiPackets[animUid], animUid);
 }
 
 void 
@@ -876,8 +877,8 @@
   NS_ASSERT (n);
   ++gAnimUid;
   NS_LOG_INFO ("WimaxTxTrace for packet:" << gAnimUid);
-  AnimPacketInfo pktInfo (ndev, Simulator::Now (), Simulator::Now () + Seconds (0.001), UpdatePosition (n));
-  /// \todo 0.0001 is used until Wimax implements TxBegin and TxEnd traces
+  UpdatePosition (n);
+  AnimPacketInfo pktInfo (ndev, Simulator::Now ());
   AddByteTag (gAnimUid, p);
   AddPendingPacket (AnimationInterface::WIMAX, gAnimUid, pktInfo);
   OutputWirelessPacketTxInfo (p, pktInfo, gAnimUid);
@@ -897,11 +898,9 @@
   NS_LOG_INFO ("WimaxRxTrace for packet:" << animUid);
   NS_ASSERT (IsPacketPending (animUid, AnimationInterface::WIMAX) == true);
   AnimPacketInfo& pktInfo = m_pendingWimaxPackets[animUid];
-  pktInfo.ProcessRxBegin (ndev, Simulator::Now ());
-  pktInfo.ProcessRxEnd (ndev, Simulator::Now () + Seconds (0.001), UpdatePosition (n));
-  /// \todo 0.001 is used until Wimax implements RxBegin and RxEnd traces
-  AnimRxInfo pktrxInfo = pktInfo.GetRxInfo (ndev);
-  OutputWirelessPacketRxInfo (p, pktrxInfo, animUid);
+  UpdatePosition (n);
+  pktInfo.ProcessRxBegin (ndev, Simulator::Now ().GetSeconds ());
+  OutputWirelessPacketRxInfo (p, pktInfo, animUid);
 }
 
 void 
@@ -915,8 +914,8 @@
   NS_ASSERT (n);
   ++gAnimUid;
   NS_LOG_INFO ("LteTxTrace for packet:" << gAnimUid);
-  AnimPacketInfo pktInfo (ndev, Simulator::Now (), Simulator::Now () + Seconds (0.001), UpdatePosition (n));
-  /// \todo 0.0001 is used until Lte implements TxBegin and TxEnd traces
+  UpdatePosition (n);
+  AnimPacketInfo pktInfo (ndev, Simulator::Now ());
   AddByteTag (gAnimUid, p);
   AddPendingPacket (AnimationInterface::LTE, gAnimUid, pktInfo);
   OutputWirelessPacketTxInfo (p, pktInfo, gAnimUid);
@@ -940,11 +939,9 @@
       return;
     }
   AnimPacketInfo& pktInfo = m_pendingLtePackets[animUid];
-  pktInfo.ProcessRxBegin (ndev, Simulator::Now ());
-  pktInfo.ProcessRxEnd (ndev, Simulator::Now () + Seconds (0.001), UpdatePosition (n));
-  /// \todo 0.001 is used until Lte implements RxBegin and RxEnd traces
-  AnimRxInfo pktrxInfo = pktInfo.GetRxInfo (ndev);
-  OutputWirelessPacketRxInfo (p, pktrxInfo, animUid);
+  UpdatePosition (n);
+  pktInfo.ProcessRxBegin (ndev, Simulator::Now ().GetSeconds ());
+  OutputWirelessPacketRxInfo (p, pktInfo, animUid);
 }
 
 void 
@@ -971,8 +968,8 @@
       Ptr <Packet> p = *i;
       ++gAnimUid;
       NS_LOG_INFO ("LteSpectrumPhyTxTrace for packet:" << gAnimUid);
-      AnimPacketInfo pktInfo (ndev, Simulator::Now (), Simulator::Now () + Seconds (0.001), UpdatePosition (n));
-      /// \todo 0.0001 is used until Lte implements TxBegin and TxEnd traces
+      UpdatePosition (n);
+      AnimPacketInfo pktInfo (ndev, Simulator::Now ());
       AddByteTag (gAnimUid, p);
       AddPendingPacket (AnimationInterface::LTE, gAnimUid, pktInfo);
       OutputWirelessPacketTxInfo (p, pktInfo, gAnimUid);
@@ -1009,11 +1006,9 @@
           return;
         }
       AnimPacketInfo& pktInfo = m_pendingLtePackets[animUid];
-      pktInfo.ProcessRxBegin (ndev, Simulator::Now ());
-      pktInfo.ProcessRxEnd (ndev, Simulator::Now () + Seconds (0.001), UpdatePosition (n));
-      /// \todo 0.001 is used until Lte implements RxBegin and RxEnd traces
-      AnimRxInfo pktrxInfo = pktInfo.GetRxInfo (ndev);
-      OutputWirelessPacketRxInfo (p, pktrxInfo, animUid);
+      UpdatePosition (n);
+      pktInfo.ProcessRxBegin (ndev, Simulator::Now ().GetSeconds ());
+      OutputWirelessPacketRxInfo (p, pktInfo, animUid);
     }
 }
 
@@ -1029,7 +1024,8 @@
   ++gAnimUid;
   NS_LOG_INFO ("CsmaPhyTxBeginTrace for packet:" << gAnimUid);
   AddByteTag (gAnimUid, p);
-  AnimPacketInfo pktInfo (ndev, Simulator::Now (), Simulator::Now (), UpdatePosition (n));
+  UpdatePosition (n);
+  AnimPacketInfo pktInfo (ndev, Simulator::Now ());
   AddPendingPacket (AnimationInterface::CSMA, gAnimUid, pktInfo);
 
 }
@@ -1049,7 +1045,8 @@
     {
       NS_LOG_WARN ("CsmaPhyTxEndTrace: unknown Uid"); 
       NS_FATAL_ERROR ("CsmaPhyTxEndTrace: unknown Uid"); 
-      AnimPacketInfo pktInfo (ndev, Simulator::Now (), Simulator::Now (), UpdatePosition (n));
+      UpdatePosition (n);
+      AnimPacketInfo pktInfo (ndev, Simulator::Now ());
       AddPendingPacket (AnimationInterface::CSMA, animUid, pktInfo);
       NS_LOG_WARN ("Unknown Uid, but adding Csma Packet anyway");
     }
@@ -1075,15 +1072,11 @@
     }
   /// \todo NS_ASSERT (CsmaPacketIsPending (AnimUid) == true);
   AnimPacketInfo& pktInfo = m_pendingCsmaPackets[animUid];
-  pktInfo.ProcessRxBegin (ndev, Simulator::Now ());
-  pktInfo.ProcessRxEnd (ndev, Simulator::Now (), UpdatePosition (n));
+  UpdatePosition (n);
+  pktInfo.ProcessRxBegin (ndev, Simulator::Now ().GetSeconds ());
   NS_LOG_INFO ("CsmaPhyRxEndTrace for packet:" << animUid);
-  AnimRxInfo pktrxInfo = pktInfo.GetRxInfo (ndev);
-  if (pktrxInfo.IsPhyRxComplete ())
-    {
-      NS_LOG_INFO ("CsmaPhyRxEndTrace for packet:" << animUid << " complete");
-      OutputCsmaPacket (p, pktInfo, pktrxInfo);
-    }
+  NS_LOG_INFO ("CsmaPhyRxEndTrace for packet:" << animUid << " complete");
+  OutputCsmaPacket (p, pktInfo);
 }
 
 void 
@@ -1105,12 +1098,8 @@
     }
   /// \todo NS_ASSERT (CsmaPacketIsPending (AnimUid) == true);
   AnimPacketInfo& pktInfo = m_pendingCsmaPackets[animUid];
-  AnimRxInfo pktrxInfo = pktInfo.GetRxInfo (ndev);
-  if (pktrxInfo.IsPhyRxComplete ())
-    {
-      NS_LOG_INFO ("MacRxTrace for packet:" << animUid << " complete");
-      OutputCsmaPacket (p, pktInfo, pktrxInfo);
-    }
+  NS_LOG_INFO ("MacRxTrace for packet:" << animUid << " complete");
+  OutputCsmaPacket (p, pktInfo);
 }
 
 void
@@ -1122,34 +1111,33 @@
     nodeId = pktInfo.m_txnd->GetNode ()->GetId ();
   else
     nodeId = pktInfo.m_txNodeId;
-  double lbTx = pktInfo.m_firstLastBitDelta + pktInfo.m_fbTx;
-  WriteXmlPRef (animUid, nodeId, pktInfo.m_fbTx, lbTx, m_enablePacketMetadata? GetPacketMetadata (p):"");
+  WriteXmlPRef (animUid, nodeId, pktInfo.m_fbTx, m_enablePacketMetadata? GetPacketMetadata (p):"");
 
 }
 
 void 
-AnimationInterface::OutputWirelessPacketRxInfo (Ptr<const Packet> p, AnimRxInfo pktrxInfo, uint64_t animUid)
+AnimationInterface::OutputWirelessPacketRxInfo (Ptr<const Packet> p, AnimPacketInfo & pktInfo, uint64_t animUid)
 {
   CheckMaxPktsPerTraceFile ();
-  uint32_t rxId = pktrxInfo.m_rxnd->GetNode ()->GetId ();
-  WriteXmlP (animUid, "wpr", rxId, pktrxInfo.m_fbRx, pktrxInfo.m_lbRx);
+  uint32_t rxId = pktInfo.m_rxnd->GetNode ()->GetId ();
+  WriteXmlP (animUid, "wpr", rxId, pktInfo.m_fbRx, pktInfo.m_lbRx);
 }
 
 void 
-AnimationInterface::OutputCsmaPacket (Ptr<const Packet> p, AnimPacketInfo &pktInfo, AnimRxInfo pktrxInfo)
+AnimationInterface::OutputCsmaPacket (Ptr<const Packet> p, AnimPacketInfo &pktInfo)
 {
   CheckMaxPktsPerTraceFile ();
   NS_ASSERT (pktInfo.m_txnd);
   uint32_t nodeId = pktInfo.m_txnd->GetNode ()->GetId ();
-  uint32_t rxId = pktrxInfo.m_rxnd->GetNode ()->GetId ();
+  uint32_t rxId = pktInfo.m_rxnd->GetNode ()->GetId ();
 
   WriteXmlP ("p", 
              nodeId, 
              pktInfo.m_fbTx, 
              pktInfo.m_lbTx, 
              rxId,
-             pktrxInfo.m_fbRx, 
-             pktrxInfo.m_lbRx, 
+             pktInfo.m_fbRx, 
+             pktInfo.m_lbRx, 
              m_enablePacketMetadata? GetPacketMetadata (p):"");
 }
 
@@ -1590,9 +1578,14 @@
                   if (n1Id < n2Id)
                     { 
                       // ouptut the p2p link
-                      NS_LOG_INFO ("Link:" << GetIpv4Address (dev) << ":" << GetMacAddress (dev) << "----" << GetIpv4Address (chDev) << ":" << GetMacAddress (chDev) );
+                      NS_LOG_INFO ("Link:" << GetIpv4Address (dev) << ":" << GetMacAddress (dev) << "----" << GetIpv4Address (chDev) << ":" << GetMacAddress (chDev));
                       AddToIpv4AddressNodeIdTable (GetIpv4Address (dev), n1Id);
                       AddToIpv4AddressNodeIdTable (GetIpv4Address (chDev), n2Id);
+                      P2pLinkNodeIdPair p2pPair;
+                      p2pPair.fromNode = n1Id;
+                      p2pPair.toNode = n2Id;
+                      LinkProperties lp = {GetIpv4Address (dev) + "~" + GetMacAddress (dev), GetIpv4Address (chDev) + "~" + GetMacAddress (chDev), ""};
+                      m_linkProperties[p2pPair] = lp;
                       WriteXmlLink (n1Id, 0, n2Id);
                     }
                 }
@@ -2046,15 +2039,18 @@
 {
   AnimXmlElement element ("anim");
   element.AddAttribute ("ver", GetNetAnimVersion ());
-  element.Close ();
+  FILE * f = m_f;
   if (!routing)
     {
-      WriteN (element.GetElementString (), m_f);
+      element.AddAttribute ("filetype", "animation");
     }
   else
     {
-      WriteN (element.GetElementString (), m_routingF);
+      element.AddAttribute ("filetype", "routing");
+      f = m_routingF;
     }
+  element.Close ();
+  WriteN (element.GetElementString (), f);
 }
 
 void 
@@ -2162,13 +2158,12 @@
 
 
 void 
-AnimationInterface::WriteXmlPRef (uint64_t animUid, uint32_t fId, double fbTx, double lbTx, std::string metaInfo)
+AnimationInterface::WriteXmlPRef (uint64_t animUid, uint32_t fId, double fbTx, std::string metaInfo)
 {
   AnimXmlElement element ("pr");
   element.AddAttribute ("uId", animUid);
   element.AddAttribute ("fId", fId);
   element.AddAttribute ("fbTx", fbTx);
-  element.AddAttribute ("lbTx", lbTx);
   if (!metaInfo.empty ())
     {
       element.AddAttribute ("meta-info", metaInfo.c_str ());
@@ -2339,6 +2334,7 @@
 {
   static TypeId tid = TypeId ("ns3::AnimByteTag")
     .SetParent<Tag> ()
+    .SetGroupName ("NetAnim")
     .AddConstructor<AnimByteTag> ()
   ;
   return tid;
@@ -2391,8 +2387,7 @@
     m_txNodeId (0),
     m_fbTx (0), 
     m_lbTx (0), 
-    m_txLoc (Vector (0,0,0)), 
-    m_firstLastBitDelta (0)
+    m_lbRx (0)
 {
 }
 
@@ -2402,84 +2397,28 @@
   m_txNodeId = pInfo.m_txNodeId;
   m_fbTx = pInfo.m_fbTx;
   m_lbTx = pInfo.m_lbTx;
-  m_txLoc = pInfo.m_txLoc;
-  m_firstLastBitDelta = pInfo.m_firstLastBitDelta;
+  m_lbRx = pInfo.m_lbRx;
 }
 
 AnimationInterface::AnimPacketInfo::AnimPacketInfo (Ptr <const NetDevice> txnd, 
                                 const Time fbTx, 
-                                const Time lbTx, 
-                                Vector txLoc, 
                                 uint32_t txNodeId)
   : m_txnd (txnd), 
     m_txNodeId (0),
     m_fbTx (fbTx.GetSeconds ()), 
-    m_lbTx (lbTx.GetSeconds ()), 
-    m_txLoc (txLoc),
-    m_firstLastBitDelta (0)
+    m_lbTx (0), 
+    m_lbRx (0)
 {
   if (!m_txnd)
     m_txNodeId = txNodeId;
 }
 
 void 
-AnimationInterface::AnimPacketInfo::ProcessRxBegin (Ptr<const NetDevice> nd, const Time fbRx)
-{
-  m_rx[nd->GetNode ()->GetId ()] = AnimRxInfo (fbRx, nd, 0);
-}
-
-bool 
-AnimationInterface::AnimPacketInfo::ProcessRxEnd (Ptr<const NetDevice> nd, const Time lbRx, Vector rxLoc)
-{
-  uint32_t NodeId = nd->GetNode ()->GetId (); 
-  // Find the RxInfo
-  if (m_rx.find (NodeId) == m_rx.end ())
-    {
-      return false;
-    } 
-  AnimRxInfo& rxInfo = m_rx[NodeId];
-  // Check if the NetDevice matches. A node may have several NetDevices
-  if (rxInfo.m_rxnd != nd) 
-    {
-      return false; 
-    }
-  rxInfo.rxRange = CalculateDistance (m_txLoc, rxLoc);
-  rxInfo.m_lbRx = lbRx.GetSeconds ();
-  rxInfo.SetPhyRxComplete ();
-  m_firstLastBitDelta = rxInfo.m_lbRx - rxInfo.m_fbRx;
-  return true;
-}
-
-AnimationInterface::AnimRxInfo 
-AnimationInterface::AnimPacketInfo::GetRxInfo (Ptr<const NetDevice> nd)
-{
-  uint32_t NodeId = nd->GetNode ()->GetId (); 
-  NS_ASSERT (m_rx.find (NodeId) != m_rx.end ()); 
-  return m_rx[NodeId];
-}
-
-void 
-AnimationInterface::AnimPacketInfo::RemoveRxInfo (Ptr<const NetDevice> nd)
-{
-  uint32_t NodeId = nd->GetNode ()->GetId (); 
-  m_rx.erase (m_rx.find (NodeId));
-}
-
-void 
-AnimationInterface::AnimPacketInfo::ProcessRxDrop (Ptr<const NetDevice> nd)
-{
-}
-
-bool 
-AnimationInterface::AnimRxInfo::IsPhyRxComplete ()
-{
-  return m_PhyRxComplete;
-}
-
-void 
-AnimationInterface::AnimRxInfo::SetPhyRxComplete ()
+AnimationInterface::AnimPacketInfo::ProcessRxBegin (Ptr<const NetDevice> nd, const double fbRx)
 {
-  m_PhyRxComplete = true; 
+  Ptr <Node> n = nd->GetNode ();
+  m_fbRx = fbRx;
+  m_rxnd = nd;
 }
 
 } // namespace ns3
diff -Naur ns-3.22/src/netanim/model/animation-interface.h ns-3.23/src/netanim/model/animation-interface.h
--- ns-3.22/src/netanim/model/animation-interface.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/netanim/model/animation-interface.h	2015-05-13 11:05:27.000000000 -0700
@@ -47,7 +47,7 @@
 
 #define MAX_PKTS_PER_TRACE_FILE 100000
 #define PURGE_INTERVAL 5
-#define NETANIM_VERSION "netanim-3.105"
+#define NETANIM_VERSION "netanim-3.106"
 
 
 struct NodeSize;
@@ -420,44 +420,21 @@
 
 private:
 
-
-  // ##### typedef #####
-  class AnimRxInfo
-  {
-  public:
-    AnimRxInfo () {}
-    AnimRxInfo (const Time& fbRx, Ptr <const NetDevice> nd ,double rxRange)
-      : m_fbRx (fbRx.GetSeconds ()), m_lbRx (0), m_rxnd (nd), rxRange (rxRange), m_PhyRxComplete (false) {}
-    double m_fbRx;            
-    double m_lbRx;             
-    Ptr <const NetDevice> m_rxnd;
-    double rxRange;
-    bool IsPhyRxComplete ();
-    void SetPhyRxComplete ();
-  private:
-    bool m_PhyRxComplete;
-  };
-
   class AnimPacketInfo
   
   {
   public:
     AnimPacketInfo ();
     AnimPacketInfo (const AnimPacketInfo & pInfo);
-    AnimPacketInfo(Ptr <const NetDevice> tx_nd, const Time fbTx, const Time lbTx, Vector txLoc, uint32_t txNodeId = 0);
+    AnimPacketInfo(Ptr <const NetDevice> tx_nd, const Time fbTx, uint32_t txNodeId = 0);
     Ptr <const NetDevice> m_txnd;
     uint32_t m_txNodeId;
     double m_fbTx;     
     double m_lbTx;     
-    Vector m_txLoc;
-    double m_firstLastBitDelta;
-    std::map<uint32_t,AnimRxInfo> m_rx;
-    void ProcessRxBegin (Ptr <const NetDevice> nd, const Time fbRx);
-    bool ProcessRxEnd (Ptr <const NetDevice> nd, const Time fbRx, Vector rxLoc);
-    void ProcessRxDrop (Ptr <const NetDevice> nd);
-    AnimRxInfo GetRxInfo (Ptr <const NetDevice> nd);
-    void RemoveRxInfo (Ptr <const NetDevice> nd);
-  
+    double m_fbRx;            
+    double m_lbRx;
+    Ptr <const NetDevice> m_rxnd;
+    void ProcessRxBegin (Ptr <const NetDevice> nd, const double fbRx);
   };
 
   typedef struct
@@ -608,7 +585,7 @@
   AnimUidPacketInfoMap m_pendingLtePackets;
   AnimUidPacketInfoMap m_pendingCsmaPackets;
   AnimUidPacketInfoMap m_pendingUanPackets;
-  std::map<uint32_t, Vector> m_nodeLocation;
+  std::map <uint32_t, Vector> m_nodeLocation;
   std::map <std::string, uint32_t> m_macToNodeIdMap;
   std::map <std::string, uint32_t> m_ipv4ToNodeIdMap;
   NodeColorsMap m_nodeColors;
@@ -621,6 +598,7 @@
   std::vector <std::string> m_resources;
   std::vector <std::string> m_nodeCounters;
 
+  /* Value-added custom counters */
   NodeCounterMap64 m_nodeIpv4Drop;
   NodeCounterMap64 m_nodeIpv4Tx;
   NodeCounterMap64 m_nodeIpv4Rx;
@@ -764,8 +742,8 @@
   void WriteNonP2pLinkProperties (uint32_t id, std::string ipv4Address, std::string channelType);
   void WriteNodeUpdate (uint32_t nodeId);
   void OutputWirelessPacketTxInfo (Ptr<const Packet> p, AnimPacketInfo& pktInfo, uint64_t animUid);
-  void OutputWirelessPacketRxInfo (Ptr<const Packet> p, AnimRxInfo pktrxInfo, uint64_t animUid);
-  void OutputCsmaPacket (Ptr<const Packet> p, AnimPacketInfo& pktInfo, AnimRxInfo pktrxInfo);
+  void OutputWirelessPacketRxInfo (Ptr<const Packet> p, AnimPacketInfo& pktInfo, uint64_t animUid);
+  void OutputCsmaPacket (Ptr<const Packet> p, AnimPacketInfo& pktInfo);
   void WriteLinkProperties ();
   void WriteNodes ();
   void WriteNodeColors ();
@@ -792,7 +770,7 @@
                                  double lbRx,
                                  std::string metaInfo = ""); 
   void WriteXmlP (uint64_t animUid, std::string pktType, uint32_t fId, double fbTx, double lbTx);
-  void WriteXmlPRef (uint64_t animUid, uint32_t fId, double fbTx, double lbTx, std::string metaInfo = "");
+  void WriteXmlPRef (uint64_t animUid, uint32_t fId, double fbTx, std::string metaInfo = "");
   void WriteXmlClose (std::string name, bool routing = false);
   void WriteXmlNonP2pLinkProperties (uint32_t id, std::string ipv4Address, std::string channelType);
   void WriteXmlRouting (uint32_t id, std::string routingInfo);
diff -Naur ns-3.22/src/netanim/wscript ns-3.23/src/netanim/wscript
--- ns-3.22/src/netanim/wscript	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/netanim/wscript	2015-05-13 11:05:27.000000000 -0700
@@ -3,7 +3,7 @@
 import wutils
 
 # Required NetAnim version
-NETANIM_RELEASE_NAME = "netanim-3.105"
+NETANIM_RELEASE_NAME = "netanim-3.106"
 
 
 def build (bld) :
diff -Naur ns-3.22/src/network/bindings/modulegen__gcc_ILP32.py ns-3.23/src/network/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/network/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -1540,11 +1540,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/network/bindings/modulegen__gcc_LP64.py ns-3.23/src/network/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/network/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -1540,11 +1540,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/network/helper/delay-jitter-estimation.cc ns-3.23/src/network/helper/delay-jitter-estimation.cc
--- ns-3.22/src/network/helper/delay-jitter-estimation.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/helper/delay-jitter-estimation.cc	2015-05-13 11:05:27.000000000 -0700
@@ -66,6 +66,7 @@
 {
   static TypeId tid = TypeId ("anon::DelayJitterEstimationTimestampTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<DelayJitterEstimationTimestampTag> ()
     .AddAttribute ("CreationTime",
                    "The time at which the timestamp was created",
diff -Naur ns-3.22/src/network/model/application.cc ns-3.23/src/network/model/application.cc
--- ns-3.22/src/network/model/application.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/application.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::Application")
     .SetParent<Object> ()
+    .SetGroupName("Network")
     .AddAttribute ("StartTime", "Time at which the application will start",
                    TimeValue (Seconds (0.0)),
                    MakeTimeAccessor (&Application::m_startTime),
diff -Naur ns-3.22/src/network/model/channel.cc ns-3.23/src/network/model/channel.cc
--- ns-3.22/src/network/model/channel.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::Channel")
     .SetParent<Object> ()
+    .SetGroupName("Network")
     .AddAttribute ("Id", "The id (unique integer) of this Channel.",
                    TypeId::ATTR_GET,
                    UintegerValue (0),
diff -Naur ns-3.22/src/network/model/channel-list.cc ns-3.23/src/network/model/channel-list.cc
--- ns-3.22/src/network/model/channel-list.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/channel-list.cc	2015-05-13 11:05:27.000000000 -0700
@@ -108,6 +108,7 @@
 {
   static TypeId tid = TypeId ("ns3::ChannelListPriv")
     .SetParent<Object> ()
+    .SetGroupName("Network")
     .AddAttribute ("ChannelList", "The list of all channels created during the simulation.",
                    ObjectVectorValue (),
                    MakeObjectVectorAccessor (&ChannelListPriv::m_channels),
diff -Naur ns-3.22/src/network/model/chunk.cc ns-3.23/src/network/model/chunk.cc
--- ns-3.22/src/network/model/chunk.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/chunk.cc	2015-05-13 11:05:27.000000000 -0700
@@ -9,6 +9,7 @@
 {
   static TypeId tid = TypeId ("ns3::Chunk")
     .SetParent<ObjectBase> ()
+    .SetGroupName("Network")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/network/model/header.cc ns-3.23/src/network/model/header.cc
--- ns-3.22/src/network/model/header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -17,6 +17,7 @@
 {
   static TypeId tid = TypeId ("ns3::Header")
     .SetParent<Chunk> ()
+    .SetGroupName("Network")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/network/model/net-device.cc ns-3.23/src/network/model/net-device.cc
--- ns-3.22/src/network/model/net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::NetDevice")
     .SetParent<Object> ()
+    .SetGroupName("Network")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/network/model/node.cc ns-3.23/src/network/model/node.cc
--- ns-3.22/src/network/model/node.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/node.cc	2015-05-13 11:05:27.000000000 -0700
@@ -51,6 +51,7 @@
 {
   static TypeId tid = TypeId ("ns3::Node")
     .SetParent<Object> ()
+    .SetGroupName("Network")
     .AddConstructor<Node> ()
     .AddAttribute ("DeviceList", "The list of devices associated to this Node.",
                    ObjectVectorValue (),
diff -Naur ns-3.22/src/network/model/node-list.cc ns-3.23/src/network/model/node-list.cc
--- ns-3.22/src/network/model/node-list.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/node-list.cc	2015-05-13 11:05:27.000000000 -0700
@@ -111,6 +111,7 @@
 {
   static TypeId tid = TypeId ("ns3::NodeListPriv")
     .SetParent<Object> ()
+    .SetGroupName("Network")
     .AddAttribute ("NodeList", "The list of all nodes created during the simulation.",
                    ObjectVectorValue (),
                    MakeObjectVectorAccessor (&NodeListPriv::m_nodes),
diff -Naur ns-3.22/src/network/model/socket.cc ns-3.23/src/network/model/socket.cc
--- ns-3.22/src/network/model/socket.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/socket.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,7 +37,8 @@
 Socket::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::Socket")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Network");
   return tid;
 }
 
@@ -539,6 +540,7 @@
 {
   static TypeId tid = TypeId ("ns3::SocketAddressTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<SocketAddressTag> ()
   ;
   return tid;
@@ -599,6 +601,7 @@
 {
   static TypeId tid = TypeId ("ns3::SocketIpTtlTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<SocketIpTtlTag> ()
   ;
   return tid;
@@ -657,6 +660,7 @@
 {
   static TypeId tid = TypeId ("ns3::SocketIpv6HopLimitTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<SocketIpv6HopLimitTag> ()
   ;
   return tid;
@@ -718,6 +722,7 @@
 {
   static TypeId tid = TypeId ("ns3::SocketSetDontFragmentTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<SocketSetDontFragmentTag> ();
   return tid;
 }
@@ -773,6 +778,7 @@
 {
   static TypeId tid = TypeId ("ns3::SocketIpTosTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<SocketIpTosTag> ()
     ;
   return tid;
@@ -829,6 +835,7 @@
 {
   static TypeId tid = TypeId ("ns3::SocketIpv6TclassTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network") 
     .AddConstructor<SocketIpv6TclassTag> ()
     ;
   return tid;
diff -Naur ns-3.22/src/network/model/socket-factory.cc ns-3.23/src/network/model/socket-factory.cc
--- ns-3.22/src/network/model/socket-factory.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/socket-factory.cc	2015-05-13 11:05:27.000000000 -0700
@@ -29,7 +29,8 @@
 TypeId SocketFactory::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::SocketFactory")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Network");
   return tid;
 }
 
diff -Naur ns-3.22/src/network/model/tag.cc ns-3.23/src/network/model/tag.cc
--- ns-3.22/src/network/model/tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -28,6 +28,7 @@
 {
   static TypeId tid = TypeId ("ns3::Tag")
     .SetParent<ObjectBase> ()
+    .SetGroupName("Network")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/network/model/trailer.cc ns-3.23/src/network/model/trailer.cc
--- ns-3.22/src/network/model/trailer.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/model/trailer.cc	2015-05-13 11:05:27.000000000 -0700
@@ -17,6 +17,7 @@
 {
   static TypeId tid = TypeId ("ns3::Trailer")
     .SetParent<Chunk> ()
+    .SetGroupName("Network")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/network/utils/data-rate.cc ns-3.23/src/network/utils/data-rate.cc
--- ns-3.22/src/network/utils/data-rate.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/data-rate.cc	2015-05-13 11:05:27.000000000 -0700
@@ -232,6 +232,20 @@
   return static_cast<double>(bytes)*8/m_bps;
 }
 
+Time DataRate::CalculateBytesTxTime (uint32_t bytes) const
+{
+  NS_LOG_FUNCTION (this << bytes);
+  // \todo avoid to use double (if possible).
+  return Seconds (static_cast<double>(bytes)*8/m_bps);
+}
+
+Time DataRate::CalculateBitsTxTime (uint32_t bits) const
+{
+  NS_LOG_FUNCTION (this << bits);
+  // \todo avoid to use double (if possible).
+  return Seconds (static_cast<double>(bits)/m_bps);
+}
+
 uint64_t DataRate::GetBitRate () const
 {
   NS_LOG_FUNCTION (this);
diff -Naur ns-3.22/src/network/utils/data-rate.h ns-3.23/src/network/utils/data-rate.h
--- ns-3.22/src/network/utils/data-rate.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/data-rate.h	2015-05-13 11:05:27.000000000 -0700
@@ -27,6 +27,7 @@
 #include "ns3/nstime.h"
 #include "ns3/attribute.h"
 #include "ns3/attribute-helper.h"
+#include "ns3/deprecated.h"
 
 namespace ns3 {
 
@@ -42,9 +43,9 @@
  * from strings, natural multiplication e.g.:
  * \code
  *   DataRate x("56kbps");
- *   double nBits = x*ns3::Seconds(19.2);
+ *   double nBits = x*ns3::Seconds (19.2);
  *   uint32_t nBytes = 20;
- *   double txtime = x.CalclulateTxTime(nBytes);
+ *   Time txtime = x.CalculateBytesTxTime (nBytes);
  * \endcode
  * This class also supports the regular comparison operators \c <, \c >,
  * \c <=, \c >=, \c ==, and \c !=
@@ -164,9 +165,27 @@
    *
    * Calculates the transmission time at this data rate
    * \param bytes The number of bytes (not bits) for which to calculate
+   * \return The transmission time for the number of bytes specified
+   */
+  Time CalculateBytesTxTime (uint32_t bytes) const;
+
+  /**
+   * \brief Calculate transmission time
+   *
+   * Calculates the transmission time at this data rate
+   * \param bits The number of bits (not bytes) for which to calculate
+   * \return The transmission time for the number of bits specified
+   */
+  Time CalculateBitsTxTime (uint32_t bits) const;
+
+  /**
+   * \brief Calculate transmission time
+   *
+   * Calculates the transmission time at this data rate
+   * \param bytes The number of bytes (not bits) for which to calculate
    * \return The transmission time in seconds for the number of bytes specified
    */
-  double CalculateTxTime (uint32_t bytes) const;
+  double CalculateTxTime (uint32_t bytes) const NS_DEPRECATED;
 
   /**
    * Get the underlying bitrate
diff -Naur ns-3.22/src/network/utils/drop-tail-queue.cc ns-3.23/src/network/utils/drop-tail-queue.cc
--- ns-3.22/src/network/utils/drop-tail-queue.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/drop-tail-queue.cc	2015-05-13 11:05:27.000000000 -0700
@@ -31,6 +31,7 @@
 {
   static TypeId tid = TypeId ("ns3::DropTailQueue")
     .SetParent<Queue> ()
+    .SetGroupName("Network")
     .AddConstructor<DropTailQueue> ()
     .AddAttribute ("Mode", 
                    "Whether to use bytes (see MaxBytes) or packets (see MaxPackets) as the maximum queue size metric.",
diff -Naur ns-3.22/src/network/utils/error-model.cc ns-3.23/src/network/utils/error-model.cc
--- ns-3.22/src/network/utils/error-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/error-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -83,6 +83,7 @@
 { 
   static TypeId tid = TypeId ("ns3::ErrorModel")
     .SetParent<Object> ()
+    .SetGroupName("Network")
     .AddAttribute ("IsEnabled", "Whether this ErrorModel is enabled or not.",
                    BooleanValue (true),
                    MakeBooleanAccessor (&ErrorModel::m_enable),
@@ -151,6 +152,7 @@
 { 
   static TypeId tid = TypeId ("ns3::RateErrorModel")
     .SetParent<ErrorModel> ()
+    .SetGroupName("Network")
     .AddConstructor<RateErrorModel> ()
     .AddAttribute ("ErrorUnit", "The error unit",
                    EnumValue (ERROR_UNIT_BYTE),
@@ -290,6 +292,7 @@
 {
   static TypeId tid = TypeId ("ns3::BurstErrorModel")
     .SetParent<ErrorModel> ()
+    .SetGroupName("Network")
     .AddConstructor<BurstErrorModel> ()
     .AddAttribute ("ErrorRate", "The burst error event.",
                    DoubleValue (0.0),
@@ -418,6 +421,7 @@
 { 
   static TypeId tid = TypeId ("ns3::ListErrorModel")
     .SetParent<ErrorModel> ()
+    .SetGroupName("Network")
     .AddConstructor<ListErrorModel> ()
   ;
   return tid;
@@ -487,6 +491,7 @@
 { 
   static TypeId tid = TypeId ("ns3::ReceiveListErrorModel")
     .SetParent<ErrorModel> ()
+    .SetGroupName("Network")
     .AddConstructor<ReceiveListErrorModel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/network/utils/ethernet-header.cc ns-3.23/src/network/utils/ethernet-header.cc
--- ns-3.22/src/network/utils/ethernet-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/ethernet-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -118,6 +118,7 @@
 {
   static TypeId tid = TypeId ("ns3::EthernetHeader")
     .SetParent<Header> ()
+    .SetGroupName("Network")
     .AddConstructor<EthernetHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/network/utils/ethernet-trailer.cc ns-3.23/src/network/utils/ethernet-trailer.cc
--- ns-3.22/src/network/utils/ethernet-trailer.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/ethernet-trailer.cc	2015-05-13 11:05:27.000000000 -0700
@@ -108,6 +108,7 @@
 {
   static TypeId tid = TypeId ("ns3::EthernetTrailer")
     .SetParent<Trailer> ()
+    .SetGroupName("Network")
     .AddConstructor<EthernetTrailer> ()
   ;
   return tid;
diff -Naur ns-3.22/src/network/utils/flow-id-tag.cc ns-3.23/src/network/utils/flow-id-tag.cc
--- ns-3.22/src/network/utils/flow-id-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/flow-id-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -31,6 +31,7 @@
 {
   static TypeId tid = TypeId ("ns3::FlowIdTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<FlowIdTag> ()
   ;
   return tid;
diff -Naur ns-3.22/src/network/utils/llc-snap-header.cc ns-3.23/src/network/utils/llc-snap-header.cc
--- ns-3.22/src/network/utils/llc-snap-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/llc-snap-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::LlcSnapHeader")
     .SetParent<Header> ()
+    .SetGroupName("Network")
     .AddConstructor<LlcSnapHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/network/utils/packetbb.cc ns-3.23/src/network/utils/packetbb.cc
--- ns-3.22/src/network/utils/packetbb.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/packetbb.cc	2015-05-13 11:05:27.000000000 -0700
@@ -839,6 +839,7 @@
 {
   static TypeId tid = TypeId ("ns3::PbbPacket")
     .SetParent<Header> ()
+    .SetGroupName("Network")
     .AddConstructor<PbbPacket> ()
   ;
   return tid;
diff -Naur ns-3.22/src/network/utils/packet-burst.cc ns-3.23/src/network/utils/packet-burst.cc
--- ns-3.22/src/network/utils/packet-burst.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/packet-burst.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::PacketBurst")
     .SetParent<Object> ()
+    .SetGroupName("Network")
     .AddConstructor<PacketBurst> ()
   ;
   return tid;
diff -Naur ns-3.22/src/network/utils/packet-probe.cc ns-3.23/src/network/utils/packet-probe.cc
--- ns-3.22/src/network/utils/packet-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/packet-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::PacketProbe")
     .SetParent<Probe> ()
+    .SetGroupName("Network")
     .AddConstructor<PacketProbe> ()
     .AddTraceSource ( "Output",
                       "The packet that serve as the output for this probe",
diff -Naur ns-3.22/src/network/utils/packet-socket.cc ns-3.23/src/network/utils/packet-socket.cc
--- ns-3.22/src/network/utils/packet-socket.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/packet-socket.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::PacketSocket")
     .SetParent<Socket> ()
+    .SetGroupName("Network")
     .AddConstructor<PacketSocket> ()
     .AddTraceSource ("Drop", "Drop packet due to receive buffer overflow",
                      MakeTraceSourceAccessor (&PacketSocket::m_dropTrace),
@@ -544,6 +545,7 @@
 {
   static TypeId tid = TypeId ("ns3::PacketSocketTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<PacketSocketTag> ()
   ;
   return tid;
@@ -607,6 +609,7 @@
 {
   static TypeId tid = TypeId ("ns3::DeviceNameTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<DeviceNameTag> ();
   return tid;
 }
diff -Naur ns-3.22/src/network/utils/packet-socket-client.cc ns-3.23/src/network/utils/packet-socket-client.cc
--- ns-3.22/src/network/utils/packet-socket-client.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/packet-socket-client.cc	2015-05-13 11:05:27.000000000 -0700
@@ -44,6 +44,7 @@
 {
   static TypeId tid = TypeId ("ns3::PacketSocketClient")
     .SetParent<Application> ()
+    .SetGroupName("Network")
     .AddConstructor<PacketSocketClient> ()
     .AddAttribute ("MaxPackets",
                    "The maximum number of packets the application will send (zero means infinite)",
diff -Naur ns-3.22/src/network/utils/packet-socket-factory.cc ns-3.23/src/network/utils/packet-socket-factory.cc
--- ns-3.22/src/network/utils/packet-socket-factory.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/packet-socket-factory.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,7 +32,8 @@
 PacketSocketFactory::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::PacketSocketFactory")
-    .SetParent<SocketFactory> ();
+    .SetParent<SocketFactory> ()
+    .SetGroupName("Network");
   return tid;
 }
 
diff -Naur ns-3.22/src/network/utils/packet-socket-server.cc ns-3.23/src/network/utils/packet-socket-server.cc
--- ns-3.22/src/network/utils/packet-socket-server.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/packet-socket-server.cc	2015-05-13 11:05:27.000000000 -0700
@@ -44,6 +44,7 @@
 {
   static TypeId tid = TypeId ("ns3::PacketSocketServer")
     .SetParent<Application> ()
+    .SetGroupName("Network")
     .AddConstructor<PacketSocketServer> ()
     .AddTraceSource ("Rx", "A packet has been received",
                      MakeTraceSourceAccessor (&PacketSocketServer::m_rxTrace),
diff -Naur ns-3.22/src/network/utils/pcap-file-wrapper.cc ns-3.23/src/network/utils/pcap-file-wrapper.cc
--- ns-3.22/src/network/utils/pcap-file-wrapper.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/pcap-file-wrapper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::PcapFileWrapper")
     .SetParent<Object> ()
+    .SetGroupName("Network")
     .AddConstructor<PcapFileWrapper> ()
     .AddAttribute ("CaptureSize",
                    "Maximum length of captured packets (cf. pcap snaplen)",
diff -Naur ns-3.22/src/network/utils/queue.cc ns-3.23/src/network/utils/queue.cc
--- ns-3.22/src/network/utils/queue.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/queue.cc	2015-05-13 11:05:27.000000000 -0700
@@ -31,6 +31,7 @@
 {
   static TypeId tid = TypeId ("ns3::Queue")
     .SetParent<Object> ()
+    .SetGroupName("Network")  
     .AddTraceSource ("Enqueue", "Enqueue a packet in the queue.",
                      MakeTraceSourceAccessor (&Queue::m_traceEnqueue),
                      "ns3::Packet::TracedCallback")
diff -Naur ns-3.22/src/network/utils/queue.h ns-3.23/src/network/utils/queue.h
--- ns-3.22/src/network/utils/queue.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/queue.h	2015-05-13 11:05:27.000000000 -0700
@@ -180,7 +180,6 @@
    */
   void Drop (Ptr<Packet> packet);
 
-private:
   /// Traced callback: fired when a packet is enqueued
   TracedCallback<Ptr<const Packet> > m_traceEnqueue;
   /// Traced callback: fired when a packet is dequeued
diff -Naur ns-3.22/src/network/utils/radiotap-header.cc ns-3.23/src/network/utils/radiotap-header.cc
--- ns-3.22/src/network/utils/radiotap-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/radiotap-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -47,6 +47,8 @@
 {
   static TypeId tid = TypeId ("ns3::RadiotapHeader")
     .SetParent<Header> ()
+    .SetGroupName("Network")
+
     .AddConstructor<RadiotapHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/network/utils/red-queue.cc ns-3.23/src/network/utils/red-queue.cc
--- ns-3.22/src/network/utils/red-queue.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/red-queue.cc	2015-05-13 11:05:27.000000000 -0700
@@ -75,6 +75,7 @@
 {
   static TypeId tid = TypeId ("ns3::RedQueue")
     .SetParent<Queue> ()
+    .SetGroupName("Network")
     .AddConstructor<RedQueue> ()
     .AddAttribute ("Mode",
                    "Determines unit for QueueLimit",
diff -Naur ns-3.22/src/network/utils/sgi-hashmap.h ns-3.23/src/network/utils/sgi-hashmap.h
--- ns-3.22/src/network/utils/sgi-hashmap.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/sgi-hashmap.h	2015-05-13 11:05:27.000000000 -0700
@@ -8,28 +8,34 @@
 /* To use gcc extensions.
  */
 #ifdef __GNUC__
-  #if __GNUC__ < 3
-     #include <hash_map.h>
-namespace sgi { using ::hash_map; }; // inherit globals
-  #else 
-     #if __GNUC__ < 4
-       #include <ext/hash_map>
-       #if __GNUC_MINOR__ == 0
-namespace sgi = std;         // GCC 3.0
-       #else
-namespace sgi = ::__gnu_cxx;       // GCC 3.1 and later
-       #endif
-     #else  // gcc 4.x and later
-       #if __GNUC_MINOR__ < 3
-         #ifdef __clang__
+  #if __GNUC__ < 3 // GCC 2.x
+    #include <hash_map.h>
+    namespace sgi { using ::hash_map; }; // inherit globals
+  #else
+    #if __GNUC__ < 4 // GCC 3.x
+      #include <ext/hash_map>
+      #if __GNUC_MINOR__ == 0
+        namespace sgi = std; // GCC 3.0
+      #else
+        namespace sgi = ::__gnu_cxx; // GCC 3.1 and later
+      #endif
+    #else
+       #if __GNUC__ < 5 // GCC 4.x
+         #if __GNUC_MINOR__ < 3 // GCC 4.0, 4.1 and 4.2
+           #ifdef __clang__ // Clang identifies as GCC 4.2
+             #undef __DEPRECATED
+           #endif
+           #include <ext/hash_map>
+           namespace sgi = ::__gnu_cxx;
+         #else
            #undef __DEPRECATED
+           #include <backward/hash_map>
+           namespace sgi = ::__gnu_cxx;
          #endif
-       #include <ext/hash_map>
-namespace sgi = ::__gnu_cxx;
-       #else
-#undef __DEPRECATED
-       #include <backward/hash_map>
-namespace sgi = ::__gnu_cxx;
+       #else // GCC 5.x
+         #undef __DEPRECATED
+         #include <backward/hash_map>
+         namespace sgi = ::__gnu_cxx;
        #endif
      #endif
   #endif
diff -Naur ns-3.22/src/network/utils/simple-channel.cc ns-3.23/src/network/utils/simple-channel.cc
--- ns-3.22/src/network/utils/simple-channel.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/simple-channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::SimpleChannel")
     .SetParent<Channel> ()
+    .SetGroupName("Network")
     .AddConstructor<SimpleChannel> ()
     .AddAttribute ("Delay", "Transmission delay through the channel",
                    TimeValue (Seconds (0)),
diff -Naur ns-3.22/src/network/utils/simple-net-device.cc ns-3.23/src/network/utils/simple-net-device.cc
--- ns-3.22/src/network/utils/simple-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/network/utils/simple-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -98,8 +98,9 @@
 TypeId
 SimpleTag::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("SimpleTag")
+  static TypeId tid = TypeId ("ns3::SimpleTag")
     .SetParent<Tag> ()
+    .SetGroupName("Network")
     .AddConstructor<SimpleTag> ()
   ;
   return tid;
@@ -187,6 +188,7 @@
 {
   static TypeId tid = TypeId ("ns3::SimpleNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName("Network") 
     .AddConstructor<SimpleNetDevice> ()
     .AddAttribute ("ReceiveErrorModel",
                    "The receiver error model used to simulate packet loss",
@@ -451,7 +453,7 @@
           Time txTime = Time (0);
           if (m_bps > DataRate (0))
             {
-              txTime = Seconds (m_bps.CalculateTxTime (packet->GetSize ()));
+              txTime = m_bps.CalculateBytesTxTime (packet->GetSize ());
             }
           m_channel->Send (p, protocolNumber, to, from, this);
           TransmitCompleteEvent = Simulator::Schedule (txTime, &SimpleNetDevice::TransmitComplete, this);
@@ -491,7 +493,7 @@
       Time txTime = Time (0);
       if (m_bps > DataRate (0))
         {
-          txTime = Seconds (m_bps.CalculateTxTime (packet->GetSize ()));
+          txTime = m_bps.CalculateBytesTxTime (packet->GetSize ());
         }
       TransmitCompleteEvent = Simulator::Schedule (txTime, &SimpleNetDevice::TransmitComplete, this);
     }
diff -Naur ns-3.22/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc ns-3.23/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
--- ns-3.22/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ipv4NixVectorRouting")
     .SetParent<Ipv4RoutingProtocol> ()
+    .SetGroupName ("NixVectorRouting")
     .AddConstructor<Ipv4NixVectorRouting> ()
   ;
   return tid;
diff -Naur ns-3.22/src/olsr/model/olsr-header.cc ns-3.23/src/olsr/model/olsr-header.cc
--- ns-3.22/src/olsr/model/olsr-header.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/olsr/model/olsr-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -112,6 +112,7 @@
 {
   static TypeId tid = TypeId ("ns3::olsr::PacketHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Olsr")
     .AddConstructor<PacketHeader> ()
   ;
   return tid;
@@ -170,6 +171,7 @@
 {
   static TypeId tid = TypeId ("ns3::olsr::MessageHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Olsr")
     .AddConstructor<MessageHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/olsr/model/olsr-routing-protocol.cc ns-3.23/src/olsr/model/olsr-routing-protocol.cc
--- ns-3.22/src/olsr/model/olsr-routing-protocol.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/olsr/model/olsr-routing-protocol.cc	2015-05-13 11:05:27.000000000 -0700
@@ -153,6 +153,7 @@
 {
   static TypeId tid = TypeId ("ns3::olsr::RoutingProtocol")
     .SetParent<Ipv4RoutingProtocol> ()
+    .SetGroupName ("Olsr")
     .AddConstructor<RoutingProtocol> ()
     .AddAttribute ("HelloInterval", "HELLO messages emission interval.",
                    TimeValue (Seconds (2)),
diff -Naur ns-3.22/src/openflow/model/openflow-interface.cc ns-3.23/src/openflow/model/openflow-interface.cc
--- ns-3.22/src/openflow/model/openflow-interface.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/openflow/model/openflow-interface.cc	2015-05-13 11:05:27.000000000 -0700
@@ -767,6 +767,7 @@
 {
   static TypeId tid = TypeId ("ns3::ofi::LearningController")
     .SetParent (Controller::GetTypeId ())
+    .SetGroupName ("Openflow")
     .AddConstructor<LearningController> ()
     .AddAttribute ("ExpirationTime",
                    "Time it takes for learned MAC state entry/created flow to expire.",
diff -Naur ns-3.22/src/openflow/model/openflow-switch-net-device.cc ns-3.23/src/openflow/model/openflow-switch-net-device.cc
--- ns-3.22/src/openflow/model/openflow-switch-net-device.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/openflow/model/openflow-switch-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -64,6 +64,7 @@
 {
   static TypeId tid = TypeId ("ns3::OpenFlowSwitchNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Openflow")
     .AddConstructor<OpenFlowSwitchNetDevice> ()
     .AddAttribute ("ID",
                    "The identification of the OpenFlowSwitchNetDevice/Datapath, needed for OpenFlow compatibility.",
diff -Naur ns-3.22/src/point-to-point/bindings/modulegen__gcc_ILP32.py ns-3.23/src/point-to-point/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/point-to-point/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/point-to-point/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -1097,11 +1097,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/point-to-point/bindings/modulegen__gcc_LP64.py ns-3.23/src/point-to-point/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/point-to-point/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/point-to-point/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -1097,11 +1097,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/point-to-point/model/point-to-point-channel.cc ns-3.23/src/point-to-point/model/point-to-point-channel.cc
--- ns-3.22/src/point-to-point/model/point-to-point-channel.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/point-to-point/model/point-to-point-channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::PointToPointChannel")
     .SetParent<Channel> ()
+    .SetGroupName ("PointToPoint")
     .AddConstructor<PointToPointChannel> ()
     .AddAttribute ("Delay", "Transmission delay through the channel",
                    TimeValue (Seconds (0)),
diff -Naur ns-3.22/src/point-to-point/model/point-to-point-net-device.cc ns-3.23/src/point-to-point/model/point-to-point-net-device.cc
--- ns-3.22/src/point-to-point/model/point-to-point-net-device.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/point-to-point/model/point-to-point-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::PointToPointNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("PointToPoint")
     .AddConstructor<PointToPointNetDevice> ()
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (DEFAULT_MTU),
@@ -246,7 +247,7 @@
   m_currentPkt = p;
   m_phyTxBeginTrace (m_currentPkt);
 
-  Time txTime = Seconds (m_bps.CalculateTxTime (p->GetSize ()));
+  Time txTime = m_bps.CalculateBytesTxTime (p->GetSize ());
   Time txCompleteTime = txTime + m_tInterframeGap;
 
   NS_LOG_LOGIC ("Schedule TransmitCompleteEvent in " << txCompleteTime.GetSeconds () << "sec");
diff -Naur ns-3.22/src/point-to-point/model/point-to-point-remote-channel.cc ns-3.23/src/point-to-point/model/point-to-point-remote-channel.cc
--- ns-3.22/src/point-to-point/model/point-to-point-remote-channel.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/point-to-point/model/point-to-point-remote-channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::PointToPointRemoteChannel")
     .SetParent<PointToPointChannel> ()
+    .SetGroupName ("PointToPoint")
     .AddConstructor<PointToPointRemoteChannel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/point-to-point/model/ppp-header.cc ns-3.23/src/point-to-point/model/ppp-header.cc
--- ns-3.22/src/point-to-point/model/ppp-header.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/point-to-point/model/ppp-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -42,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::PppHeader")
     .SetParent<Header> ()
+    .SetGroupName ("PointToPoint")
     .AddConstructor<PppHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/propagation/doc/propagation.rst ns-3.23/src/propagation/doc/propagation.rst
--- ns-3.22/src/propagation/doc/propagation.rst	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/propagation/doc/propagation.rst	2015-05-13 11:05:27.000000000 -0700
@@ -1,68 +1,333 @@
 .. include:: replace.txt
+.. highlight:: cpp
 
-.. _Propagation:
-
-###########
 Propagation
-###########
-
-The |ns3| propagation module defines two generic interfaces, namely ``PropagationLossModel`` and ``PropagationDelayModel``, for the modeling of respectively propagation loss and propagation delay.
+-----------
 
+The |ns3| propagation module defines two generic interfaces, namely :cpp:class:`PropagationLossModel`
+and :cpp:class:`PropagationDelayModel`, for the modeling of respectively propagation loss and propagation delay.
 
-++++++++++++++++++++
 PropagationLossModel
-++++++++++++++++++++
+********************
+
+Propagation loss models calculate the Rx signal power considering the Tx signal power and the
+mutual Rx and Tx antennas positions.
+
+A propagation loss model can be "chained" to another one, making a list. The final Rx power 
+takes into account all the chained models. In this way one can use a slow fading and a fast 
+fading model (for example), or model separately different fading effects.
 
+The following propagation delay models are implemented:
+
+* Cost231PropagationLossModel
+* FixedRssLossModel
+* FriisPropagationLossModel
+* ItuR1411LosPropagationLossModel
+* ItuR1411NlosOverRooftopPropagationLossModel
+* JakesPropagationLossModel
+* Kun2600MhzPropagationLossModel
+* LogDistancePropagationLossModel
+* MatrixPropagationLossModel
+* NakagamiPropagationLossModel
+* OkumuraHataPropagationLossModel
+* RandomPropagationLossModel
+* RangePropagationLossModel
+* ThreeLogDistancePropagationLossModel
+* TwoRayGroundPropagationLossModel
+
+Other models could be available thanks to other modules, e.g., the ``building`` module.
 
 Each of the available propagation loss models of ns-3 is explained in
 one of the following subsections.
 
+FriisPropagationLossModel
+=========================
 
+This model implements the Friis propagation loss model. This model was first described in [friis]_.
+The original equation was described as:
 
-FriisPropagationLossModel
-++++++++++++++++++++++++++++++++++++
+.. math::
+
+  \frac{P_r}{P_t} = \frac{A_r A_t}{d^2\lambda^2}
+
+with the following equation for the case of an isotropic antenna with no heat loss:
+ 
+.. math::
+
+  A_{isotr.} = \frac{\lambda^2}{4\pi}
+
+The final equation becomes:
+
+.. math::
+
+  \frac{P_r}{P_t} = \frac{\lambda^2}{(4 \pi d)^2}
+
+Modern extensions to this original equation are:
+
+.. math::
+
+  P_r = \frac{P_t G_t G_r \lambda^2}{(4 \pi d)^2 L}
+
+With:
+
+  :math:`P_t` : transmission power (W)
+  
+  :math:`P_r` : reception power (W)
+  
+  :math:`G_t` : transmission gain (unit-less)
+  
+  :math:`G_r` : reception gain (unit-less)
+  
+  :math:`\lambda` : wavelength (m)
+  
+  :math:`d` : distance (m)
+  
+  :math:`L` : system loss (unit-less)
+
+In the implementation, :math:`\lambda` is calculated as 
+:math:`\frac{C}{f}`, where :math:`C = 299792458` m/s is the speed of light in
+vacuum, and :math:`f` is the frequency in Hz which can be configured by
+the user via the Frequency attribute.
+
+The Friis model is valid only for propagation in free space within
+the so-called far field region, which can be considered
+approximately as the region for :math:`d > 3 \lambda`.
+The model will still return a value for :math:`d > 3 \lambda`, as
+doing so (rather than triggering a fatal error) is practical for
+many simulation scenarios. However, we stress that the values
+obtained in such conditions shall not be considered realistic. 
+
+Related with this issue, we note that the Friis formula is
+undefined for :math:`d = 0`, and results in 
+:math:`P_r > P_t` for :math:`d < \lambda / 2 \sqrt{\pi}`.
+
+Both these conditions occur outside of the far field region, so in
+principle the Friis model shall not be used in these conditions. 
+In practice, however, Friis is often used in scenarios where accurate
+propagation modeling is not deemed important, and values of 
+:math:`d = 0` can occur.
+
+To allow practical use of the model in such
+scenarios, we have to 1) return some value for :math:`d = 0`, and
+2) avoid large discontinuities in propagation loss values (which
+could lead to artifacts such as bogus capture effects which are
+much worse than inaccurate propagation loss values). The two issues
+are conflicting, as, according to the Friis formula, 
+:math:`\lim_{d \to 0}  P_r = +\infty`;
+so if, for :math:`d = 0`, we use a fixed loss value, we end up with an infinitely large
+discontinuity, which as we discussed can cause undesirable
+simulation artifacts.
+
+To avoid these artifact, this implementation of the Friis model
+provides an attribute called MinLoss which allows to specify the
+minimum total loss (in dB) returned by the model. This is used in
+such a way that 
+:math:`P_r` continuously increases for :math:`d \to 0`, until
+MinLoss is reached, and then stay constant; this allow to
+return a value for :math:`d = 0` and at the same time avoid
+discontinuities. The model won't be much realistic, but at least
+the simulation artifacts discussed before are avoided. The default value of
+MinLoss is 0 dB, which means that by default the model will return 
+:math:`P_r = P_t` for :math:`d <= \lambda / 2 \sqrt{\pi}`.
+We note that this value of :math:`d` is outside of the far field
+region, hence the validity of the model in the far field region is
+not affected.
 
 
 TwoRayGroundPropagationLossModel
-++++++++++++++++++++++++++++++++
+================================
+
+This model implements a Two-Ray Ground propagation loss model ported from NS2
+
+The Two-ray ground reflection model uses the formula
+
+.. math::
+
+  P_r = \frac{P_t * G_t * G_r * (H_t^2 * H_r^2)}{d^4 * L}
+
+The original equation in Rappaport's book assumes :math:`L = 1`.
+To be consistent with the free space equation, :math:`L` is added here.
+
+:math:`H_t` and :math:`H_r` are set at the respective nodes :math:`z` coordinate plus a model parameter
+set via SetHeightAboveZ.
+
+The two-ray model does not give a good result for short distances, due to the
+oscillation caused by constructive and destructive combination of the two
+rays. Instead the Friis free-space model is used for small distances. 
+
+The crossover distance, below which Friis is used, is calculated as follows:
+
+.. math::
+
+  dCross = \frac{(4 * \pi * H_t * H_r)}{\lambda}
+
+In the implementation,  :math:`\lambda` is calculated as 
+:math:`\frac{C}{f}`, where :math:`C = 299792458` m/s is the speed of light in
+vacuum, and :math:`f` is the frequency in Hz which can be configured by
+the user via the Frequency attribute.
 
 
 LogDistancePropagationLossModel
-+++++++++++++++++++++++++++++++
+===============================
+
+This model implements a log distance propagation model.
+
+The reception power is calculated with a so-called
+log-distance propagation model:
+
+.. math::
+
+  L = L_0 + 10 n \log(\frac{d}{d_0})
+
+where:
+
+  :math:`n` : the path loss distance exponent
+  
+  :math:`d_0` : reference distance (m)
+  
+  :math:`L_0` : path loss at reference distance (dB)
+  
+  :math:`d` :  - distance (m)
+  
+  :math:`L` : path loss (dB)
+
+When the path loss is requested at a distance smaller than
+the reference distance, the tx power is returned.
 
 ThreeLogDistancePropagationLossModel
-++++++++++++++++++++++++++++++++++++
+====================================
+
+This model implements a log distance path loss propagation model with three distance
+fields. This model is the same as ns3::LogDistancePropagationLossModel
+except that it has three distance fields: near, middle and far with
+different exponents.
+
+Within each field the reception power is calculated using the log-distance
+propagation equation:
+
+.. math::
+
+  L = L_0 + 10 \cdot n_0 \log_{10}(\frac{d}{d_0})
+
+Each field begins where the previous ends and all together form a continuous function.
+
+There are three valid distance fields: near, middle, far. Actually four: the
+first from 0 to the reference distance is invalid and returns txPowerDbm.
+
+.. math::
+
+  \underbrace{0 \cdots\cdots}_{=0} \underbrace{d_0 \cdots\cdots}_{n_0} \underbrace{d_1 \cdots\cdots}_{n_1} \underbrace{d_2 \cdots\cdots}_{n_2} \infty 
+
+Complete formula for the path loss in dB:
+
+
+.. math::
+
+  \displaystyle L =
+  \begin{cases}
+  0 & d < d_0 \\
+  L_0 + 10 \cdot n_0 \log_{10}(\frac{d}{d_0}) & d_0 \leq d < d_1 \\
+  L_0 + 10 \cdot n_0 \log_{10}(\frac{d_1}{d_0}) + 10 \cdot n_1 \log_{10}(\frac{d}{d_1}) & d_1 \leq d < d_2 \\
+  L_0 + 10 \cdot n_0 \log_{10}(\frac{d_1}{d_0}) + 10 \cdot n_1 \log_{10}(\frac{d_2}{d_1}) + 10 \cdot n_2 \log_{10}(\frac{d}{d_2})& d_2 \leq d
+  \end{cases}
+
+where:
+
+  
+  :math:`d_0, d_1, d_2` : three distance fields (m)
+  
+  :math:`n_0, n_1, n_2` : path loss distance exponent for each field (unitless)
+  
+  :math:`L_0` : path loss at reference distance (dB)
+  
+  :math:`d` :  - distance (m)
+  
+  :math:`L` : path loss (dB)
+
+When the path loss is requested at a distance smaller than the reference
+distance :math:`d_0`, the tx power (with no path loss) is returned. The
+reference distance defaults to 1m and reference loss defaults to
+:cpp:class:`FriisPropagationLossModel` with 5.15 GHz and is thus :math:`L_0` = 46.67 dB.
 
 JakesPropagationLossModel
-+++++++++++++++++++++++++
+=========================
 
-PropagationLossModel
-++++++++++++++++++++
+ToDo
+````
 
 RandomPropagationLossModel
-++++++++++++++++++++++++++
+==========================
+
+The propagation loss is totally random, and it changes each time the model is called.
+As a consequence, all the packets (even those between two fixed nodes) experience a random
+propagation loss.
 
 NakagamiPropagationLossModel
-++++++++++++++++++++++++++++
+============================
+
+This propagation loss model implements Nakagami-m fast fading propagation loss model.
+
+The Nakagami-m distribution is applied to the power level. The probability density function is defined as
+
+.. math::
+
+  p(x; m, \omega) = \frac{2 m^m}{\Gamma(m) \omega^m} x^{2m - 1} e^{-\frac{m}{\omega} x^2} = 2 x \cdot p_{\text{Gamma}}(x^2, m, \frac{m}{\omega})
+  
+with :math:`m` the fading depth parameter and :math:`\omega` the average received power.
+
+It is implemented by either a :cpp:class:`GammaRandomVariable` or a :cpp:class:`ErlangRandomVariable`
+random variable.
+
+Like in :cpp:class:ThreeLogDistancePropagationLossModel`, the :math:`m` parameter is varied
+over three distance fields:
+
+.. math::
+
+  \underbrace{0 \cdots\cdots}_{m_0} \underbrace{d_1 \cdots\cdots}_{m_1} \underbrace{d_2 \cdots\cdots}_{m_2} \infty
+
+For :math:`m = 1` the Nakagami-m distribution equals the Rayleigh distribution. Thus
+this model also implements Rayleigh distribution based fast fading.
 
 FixedRssLossModel
-+++++++++++++++++
+=================
 
-MatrixPropagationLossModel
-++++++++++++++++++++++++++
+This model sets a constant received power level independent of the transmit power.
 
-RangePropagationLossModel
-+++++++++++++++++++++++++
+The received power is constant independent of the transmit power; the user
+must set received power level.  Note that if this loss model is chained to other loss
+models, it should be the first loss model in the chain. 
+Else it will disregard the losses computed by loss models that precede it in the chain. 
 
+MatrixPropagationLossModel
+==========================
 
+The propagation loss is fixed for each pair of nodes and doesn't depend on their actual positions.
+This model shoud be useful for synthetic tests. Note that by default the propagation loss is 
+assumed to be symmetric.
 
+RangePropagationLossModel
+=========================
 
-OkumuraHataPropagationLossModel
-+++++++++++++++++++++++++++++++
+This propagation loss depends only on the distance (range) between transmitter and receiver.
 
-This model is used to model open area pathloss for long distance (i.e., > 1 Km). In order to include all the possible frequencies usable by LTE we need to consider several variants of the well known Okumura Hata model. In fact, the original Okumura Hata model [hata]_ is designed for frequencies ranging from 150 MHz to 1500 MHz, the COST231 [cost231]_ extends it for the frequency range from 1500 MHz to 2000 MHz. Another important aspect is the scenarios considered by the models, in fact the all models are originally designed for urban scenario and then only the standard one and the COST231 are extended to suburban, while only the standard one has been extended to open areas. Therefore, the model cannot cover all scenarios at all frequencies. In the following we detail the models adopted.
+The single MaxRange attribute (units of meters) determines path loss.
+Receivers at or within MaxRange meters receive the transmission at the
+transmit power level. Receivers beyond MaxRange receive at power
+-1000 dBm (effectively zero).
 
+OkumuraHataPropagationLossModel
+===============================
 
+This model is used to model open area pathloss for long distance (i.e., > 1 Km). 
+In order to include all the possible frequencies usable by LTE we need to consider 
+several variants of the well known Okumura Hata model. In fact, the original Okumura 
+Hata model [hata]_ is designed for frequencies ranging from 150 MHz to 1500 MHz, 
+the COST231 [cost231]_ extends it for the frequency range from 1500 MHz to 2000 MHz. 
+Another important aspect is the scenarios considered by the models, in fact the all 
+models are originally designed for urban scenario and then only the standard one and 
+the COST231 are extended to suburban, while only the standard one has been extended 
+to open areas. Therefore, the model cannot cover all scenarios at all frequencies. 
+In the following we detail the models adopted.
 
 The pathloss expression of the COST231 OH is:
 
@@ -76,7 +341,6 @@
 
   F(h_\mathrm{M}) = \left\{\begin{array}{ll} (1.1\log(f))-0.7 \times h_\mathrm{M} - (1.56\times \log(f)-0.8) & \mbox{for medium and small size cities} \\ 3.2\times (\log{(11.75\times h_\mathrm{M}}))^2 & \mbox{for large cities}\end{array} \right.
 
-
 .. math::
 
   C = \left\{\begin{array}{ll} 0dB & \mbox{for medium-size cities and suburban areas} \\ 3dB & \mbox{for large cities}\end{array} \right.
@@ -131,15 +395,22 @@
   L_\mathrm{O} = L_\mathrm{U} - 4.70 (\log{f})^2 + 18.33\log{f} - 40.94
 
 
-The literature lacks of extensions of the COST231 to open area (for suburban it seems that we can just impose C = 0); therefore we consider it a special case fo the suburban one.
+The literature lacks of extensions of the COST231 to open area (for suburban it seems that 
+we can just impose C = 0); therefore we consider it a special case fo the suburban one.
 
 
+Cost231PropagationLossModel
+===========================
 
+ToDo
+````
 
 ItuR1411LosPropagationLossModel
-+++++++++++++++++++++++++++++++
+===============================
 
-This model is designed for Line-of-Sight (LoS) short range outdoor communication in the frequency range 300 MHz to 100 GHz.  This model provides an upper and lower bound respectively according to the following formulas
+This model is designed for Line-of-Sight (LoS) short range outdoor communication in the 
+frequency range 300 MHz to 100 GHz.  This model provides an upper and lower bound 
+respectively according to the following formulas
 
 .. math::
 
@@ -175,11 +446,17 @@
 
 
 ItuR1411NlosOverRooftopPropagationLossModel
-+++++++++++++++++++++++++++++++++++++++++++
-
-This model is designed for Non-Line-of-Sight (LoS) short range outdoor communication over rooftops in the frequency range 300 MHz to 100 GHz. This model includes several scenario-dependent parameters, such as average street width, orientation, etc. It is advised to set the values of these parameters manually (using the ns-3 attribute system) according to the desired scenario. 
+===========================================
 
-In detail, the model is based on [walfisch]_ and [ikegami]_, where the loss is expressed as the sum of free-space loss (:math:`L_{bf}`), the diffraction loss from rooftop to street (:math:`L_{rts}`) and the reduction due to multiple screen diffraction past rows of building (:math:`L_{msd}`). The formula is:
+This model is designed for Non-Line-of-Sight (LoS) short range outdoor communication over 
+rooftops in the frequency range 300 MHz to 100 GHz. This model includes several scenario-dependent 
+parameters, such as average street width, orientation, etc. It is advised to set the values of 
+these parameters manually (using the ns-3 attribute system) according to the desired scenario. 
+
+In detail, the model is based on [walfisch]_ and [ikegami]_, where the loss is expressed 
+as the sum of free-space loss (:math:`L_{bf}`), the diffraction loss from rooftop to 
+street (:math:`L_{rts}`) and the reduction due to multiple screen diffraction past 
+rows of building (:math:`L_{msd}`). The formula is:
 
 .. math::
 
@@ -216,7 +493,10 @@
   :math:`\varphi` : is the street orientation with respect to the direct path (degrees)
 
 
-The multiple screen diffraction loss depends on the BS antenna height relative to the building height and on the incidence angle. The former is selected as the higher antenna in the communication link. Regarding the latter, the "settled field distance" is used for select the proper model; its value is given by
+The multiple screen diffraction loss depends on the BS antenna height relative to the building 
+height and on the incidence angle. The former is selected as the higher antenna in the communication 
+link. Regarding the latter, the "settled field distance" is used for select the proper model; 
+its value is given by
 
 .. math::
 
@@ -226,7 +506,8 @@
 
   :math:`\Delta h_b = h_b - h_m`
 
-Therefore, in case of :math:`l > d_s` (where `l` is the distance over which the building extend), it can be evaluated according to
+Therefore, in case of :math:`l > d_s` (where `l` is the distance over which the building extend), 
+it can be evaluated according to
 
 .. math::
 
@@ -279,38 +560,46 @@
   \rho = \sqrt{\Delta h_b^2 + b^2}
 
 
-
 Kun2600MhzPropagationLossModel
-++++++++++++++++++++++++++++++
+==============================
 
-This is the empirical model for the pathloss at 2600 MHz for urban areas which is described in [kun2600mhz]_. The model is as follows. Let :math:`d` be the distance between the transmitter and the receiver in meters; the pathloss :math:`L` in dB is calculated as:
+This is the empirical model for the pathloss at 2600 MHz for urban areas which is described in [kun2600mhz]_. 
+The model is as follows. Let :math:`d` be the distance between the transmitter and the receiver 
+in meters; the pathloss :math:`L` in dB is calculated as:
 
 .. math::
 
   L = 36 + 26\log{d}
 
 
-
-
-+++++++++++++++++++++
 PropagationDelayModel
-+++++++++++++++++++++
-
+*********************
 
 The following propagation delay models are implemented:
 
-PropagationDelayModel
-+++++++++++++++++++++
-
-RandomPropagationDelayModel
-+++++++++++++++++++++++++++
+* ConstantSpeedPropagationDelayModel
+* RandomPropagationDelayModel
 
 ConstantSpeedPropagationDelayModel
-++++++++++++++++++++++++++++++++++
+==================================
+
+In this model, the signal travels with constant speed.
+The delay is calculated according with the trasmitter and receiver positions.
+The Euclidean distance between the Tx and Rx antennas is used.
+Beware that, according to this model, the Earth is flat.
+
+RandomPropagationDelayModel
+===========================
 
+The propagation delay is totally random, and it changes each time the model is called.
+All the packets (even those between two fixed nodes) experience a random delay.
+As a consequence, the packets order is not preserved. 
 
 
+References
+**********
 
+.. [friis] Friis, H.T., "A Note on a Simple Transmission Formula," Proceedings of the IRE , vol.34, no.5, pp.254,256, May 1946
 
 .. [hata] M.Hata, "Empirical formula for propagation loss in land mobile radio
    services", IEEE Trans. on Vehicular Technology, vol. 29, pp. 317-325, 1980
diff -Naur ns-3.22/src/propagation/model/cost231-propagation-loss-model.cc ns-3.23/src/propagation/model/cost231-propagation-loss-model.cc
--- ns-3.22/src/propagation/model/cost231-propagation-loss-model.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/propagation/model/cost231-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,35 +37,29 @@
 Cost231PropagationLossModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::Cost231PropagationLossModel")
-
     .SetParent<PropagationLossModel> ()
-
+    .SetGroupName ("Propagation")
     .AddConstructor<Cost231PropagationLossModel> ()
-
     .AddAttribute ("Lambda",
                    "The wavelength  (default is 2.3 GHz at 300 000 km/s).",
                    DoubleValue (300000000.0 / 2.3e9),
                    MakeDoubleAccessor (&Cost231PropagationLossModel::m_lambda),
                    MakeDoubleChecker<double> ())
-
     .AddAttribute ("Frequency",
                    "The Frequency  (default is 2.3 GHz).",
                    DoubleValue (2.3e9),
                    MakeDoubleAccessor (&Cost231PropagationLossModel::m_frequency),
                    MakeDoubleChecker<double> ())
-
     .AddAttribute ("BSAntennaHeight",
                    "BS Antenna Height (default is 50m).",
                    DoubleValue (50.0),
                    MakeDoubleAccessor (&Cost231PropagationLossModel::m_BSAntennaHeight),
                    MakeDoubleChecker<double> ())
-
     .AddAttribute ("SSAntennaHeight",
                    "SS Antenna Height (default is 3m).",
                    DoubleValue (3),
                    MakeDoubleAccessor (&Cost231PropagationLossModel::m_SSAntennaHeight),
                    MakeDoubleChecker<double> ())
-
     .AddAttribute ("MinDistance",
                    "The distance under which the propagation model refuses to give results (m) ",
                    DoubleValue (0.5),
diff -Naur ns-3.22/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc ns-3.23/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc
--- ns-3.22/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,10 +37,9 @@
 ItuR1411LosPropagationLossModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::ItuR1411LosPropagationLossModel")
-
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<ItuR1411LosPropagationLossModel> ()
-
     .AddAttribute ("Frequency",
                    "The propagation frequency in Hz",
                    DoubleValue (2160e6),
diff -Naur ns-3.22/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc ns-3.23/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc
--- ns-3.22/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,17 +38,14 @@
 ItuR1411NlosOverRooftopPropagationLossModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::ItuR1411NlosOverRooftopPropagationLossModel")
-
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<ItuR1411NlosOverRooftopPropagationLossModel> ()
-
     .AddAttribute ("Frequency",
                    "The Frequency  (default is 2.106 GHz).",
                    DoubleValue (2160e6),
                    MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::SetFrequency),
                    MakeDoubleChecker<double> ())
-
-
     .AddAttribute ("Environment",
                    "Environment Scenario",
                    EnumValue (UrbanEnvironment),
@@ -56,7 +53,6 @@
                    MakeEnumChecker (UrbanEnvironment, "Urban",
                                     SubUrbanEnvironment, "SubUrban",
                                     OpenAreasEnvironment, "OpenAreas"))
-
     .AddAttribute ("CitySize",
                    "Dimension of the city",
                    EnumValue (LargeCity),
@@ -64,31 +60,26 @@
                    MakeEnumChecker (SmallCity, "Small",
                                     MediumCity, "Medium",
                                     LargeCity, "Large"))
-
     .AddAttribute ("RooftopLevel",
                    "The height of the rooftop level in meters",
                    DoubleValue (20.0),
                    MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::m_rooftopHeight),
                    MakeDoubleChecker<double> (0.0, 90.0))
-
     .AddAttribute ("StreetsOrientation",
                    "The orientation of streets in degrees [0,90] with respect to the direction of propagation",
                    DoubleValue (45.0),
                    MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::m_streetsOrientation),
                    MakeDoubleChecker<double> (0.0, 90.0))
-
     .AddAttribute ("StreetsWidth",
                    "The width of streets",
                    DoubleValue (20.0),
                    MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::m_streetsWidth),
                    MakeDoubleChecker<double> (0.0, 1000.0))
-
     .AddAttribute ("BuildingsExtend",
                    "The distance over which the buildings extend",
                    DoubleValue (80.0),
                    MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::m_buildingsExtend),
                    MakeDoubleChecker<double> ())
-
     .AddAttribute ("BuildingSeparation",
                    "The separation between buildings",
                    DoubleValue (50.0),
diff -Naur ns-3.22/src/propagation/model/jakes-process.cc ns-3.23/src/propagation/model/jakes-process.cc
--- ns-3.22/src/propagation/model/jakes-process.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/propagation/model/jakes-process.cc	2015-05-13 11:05:27.000000000 -0700
@@ -50,6 +50,7 @@
 {
   static TypeId tid = TypeId ("ns3::JakesProcess")
     .SetParent<Object> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<JakesProcess> ()
     .AddAttribute ("DopplerFrequencyHz", "Corresponding doppler frequency[Hz]",
                    DoubleValue (80),
diff -Naur ns-3.22/src/propagation/model/jakes-propagation-loss-model.cc ns-3.23/src/propagation/model/jakes-propagation-loss-model.cc
--- ns-3.22/src/propagation/model/jakes-propagation-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/propagation/model/jakes-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::JakesPropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<JakesPropagationLossModel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc ns-3.23/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc
--- ns-3.22/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::Kun2600MhzPropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<Kun2600MhzPropagationLossModel> ()
     ;
 
diff -Naur ns-3.22/src/propagation/model/okumura-hata-propagation-loss-model.cc ns-3.23/src/propagation/model/okumura-hata-propagation-loss-model.cc
--- ns-3.22/src/propagation/model/okumura-hata-propagation-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/propagation/model/okumura-hata-propagation-loss-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,16 +38,14 @@
 OkumuraHataPropagationLossModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::OkumuraHataPropagationLossModel")
-
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<OkumuraHataPropagationLossModel> ()
-
     .AddAttribute ("Frequency",
                    "The propagation frequency in Hz",
                    DoubleValue (2160e6),
                    MakeDoubleAccessor (&OkumuraHataPropagationLossModel::m_frequency),
                    MakeDoubleChecker<double> ())
-
     .AddAttribute ("Environment",
                    "Environment Scenario",
                    EnumValue (UrbanEnvironment),
@@ -55,7 +53,6 @@
                    MakeEnumChecker (UrbanEnvironment, "Urban",
                                     SubUrbanEnvironment, "SubUrban",
                                     OpenAreasEnvironment, "OpenAreas"))
-
     .AddAttribute ("CitySize",
                    "Dimension of the city",
                    EnumValue (LargeCity),
@@ -63,7 +60,6 @@
                    MakeEnumChecker (SmallCity, "Small",
                                     MediumCity, "Medium",
                                     LargeCity, "Large"));
-
   return tid;
 }
 
diff -Naur ns-3.22/src/propagation/model/propagation-delay-model.cc ns-3.23/src/propagation/model/propagation-delay-model.cc
--- ns-3.22/src/propagation/model/propagation-delay-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/propagation/model/propagation-delay-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::PropagationDelayModel")
     .SetParent<Object> ()
+    .SetGroupName ("Propagation")
   ;
   return tid;
 }
@@ -55,6 +56,7 @@
 {
   static TypeId tid = TypeId ("ns3::RandomPropagationDelayModel")
     .SetParent<PropagationDelayModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<RandomPropagationDelayModel> ()
     .AddAttribute ("Variable",
                    "The random variable which generates random delays (s).",
@@ -91,6 +93,7 @@
 {
   static TypeId tid = TypeId ("ns3::ConstantSpeedPropagationDelayModel")
     .SetParent<PropagationDelayModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<ConstantSpeedPropagationDelayModel> ()
     .AddAttribute ("Speed", "The propagation speed (m/s) in the propagation medium being considered. The default value is the propagation speed of light in the vacuum.",
                    DoubleValue (299792458),
diff -Naur ns-3.22/src/propagation/model/propagation-loss-model.cc ns-3.23/src/propagation/model/propagation-loss-model.cc
--- ns-3.22/src/propagation/model/propagation-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/propagation/model/propagation-loss-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -125,7 +125,7 @@
                                            Ptr<MobilityModel> b) const
 {
   double rxc = -m_variable->GetValue ();
-  NS_LOG_DEBUG ("attenuation coefficent="<<rxc<<"Db");
+  NS_LOG_DEBUG ("attenuation coefficient="<<rxc<<"Db");
   return txPowerDbm + rxc;
 }
 
@@ -145,6 +145,7 @@
 {
   static TypeId tid = TypeId ("ns3::FriisPropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<FriisPropagationLossModel> ()
     .AddAttribute ("Frequency", 
                    "The carrier frequency (in Hz) at which propagation occurs  (default is 5.15 GHz).",
@@ -456,6 +457,7 @@
 {
   static TypeId tid = TypeId ("ns3::LogDistancePropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<LogDistancePropagationLossModel> ()
     .AddAttribute ("Exponent",
                    "The exponent of the Path Loss propagation model",
@@ -645,6 +647,7 @@
 {
   static TypeId tid = TypeId ("ns3::NakagamiPropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<NakagamiPropagationLossModel> ()
     .AddAttribute ("Distance1",
                    "Beginning of the second distance field. Default is 80m.",
@@ -759,6 +762,7 @@
 {
   static TypeId tid = TypeId ("ns3::FixedRssLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<FixedRssLossModel> ()
     .AddAttribute ("Rss", "The fixed receiver Rss.",
                    DoubleValue (-150.0),
@@ -805,6 +809,7 @@
 {
   static TypeId tid = TypeId ("ns3::MatrixPropagationLossModel")
     .SetParent<PropagationLossModel> ()
+    .SetGroupName ("Propagation")
     .AddConstructor<MatrixPropagationLossModel> ()
     .AddAttribute ("DefaultLoss", "The default value for propagation loss, dB.",
                    DoubleValue (std::numeric_limits<double>::max ()),
diff -Naur ns-3.22/src/propagation/model/propagation-loss-model.h ns-3.23/src/propagation/model/propagation-loss-model.h
--- ns-3.22/src/propagation/model/propagation-loss-model.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/propagation/model/propagation-loss-model.h	2015-05-13 11:05:26.000000000 -0700
@@ -239,10 +239,10 @@
  * are conflicting, as, according to the Friis formula, 
  * \f$\lim_{d \to 0 }  P_r = +\infty \f$;
  * so if, for \f$ d = 0 \f$, we use a fixed loss value, we end up with an infinitely large
- * discontinuity, which as we discussed can cause undesireable
+ * discontinuity, which as we discussed can cause undesirable
  * simulation artifacts.
  *
- * To avoid these artifact, this implmentation of the Friis model
+ * To avoid these artifact, this implementation of the Friis model
  * provides an attribute called MinLoss which allows to specify the
  * minimum total loss (in dB) returned by the model. This is used in
  * such a way that 
@@ -350,7 +350,7 @@
  *
  * Two-ray ground reflection model.
  *
- * \f$ Pr = \frac{Pt * Gt * Gr * (ht^2 * hr^2)}{d^4 * L} \f$
+ * \f$ Pr = \frac{P_t * G_t * G_r * (H_t^2 * H_r^2)}{d^4 * L} \f$
  *
  * The original equation in Rappaport's book assumes L = 1.
  * To be consistent with the free space equation, L is added here.
@@ -364,7 +364,7 @@
  *
  * The crossover distance, below which Friis is used, is calculated as follows:
  *
- * \f$ dCross = \frac{(4 * pi * Ht * Hr)}{lambda} \f$
+ * \f$ dCross = \frac{(4 * \pi * H_t * H_r)}{\lambda} \f$
  *
  * In the implementation,  \f$ \lambda \f$ is calculated as 
  * \f$ \frac{C}{f} \f$, where  \f$ C = 299792458\f$ m/s is the speed of light in
diff -Naur ns-3.22/src/sixlowpan/model/sixlowpan-header.cc ns-3.23/src/sixlowpan/model/sixlowpan-header.cc
--- ns-3.22/src/sixlowpan/model/sixlowpan-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/sixlowpan/model/sixlowpan-header.cc	2015-05-13 11:05:26.000000000 -0700
@@ -103,7 +103,10 @@
 
 TypeId SixLowPanHc1::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::SixLowPanHc1").SetParent<Header> ().AddConstructor<SixLowPanHc1> ();
+  static TypeId tid = TypeId ("ns3::SixLowPanHc1")
+    .SetParent<Header> ()
+    .SetGroupName ("SixLowPan")
+    .AddConstructor<SixLowPanHc1> ();
   return tid;
 }
 
@@ -548,7 +551,10 @@
 
 TypeId SixLowPanFrag1::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::SixLowPanFrag1").SetParent<Header> ().AddConstructor<SixLowPanFrag1> ();
+  static TypeId tid = TypeId ("ns3::SixLowPanFrag1")
+    .SetParent<Header> ()
+    .SetGroupName ("SixLowPan")
+    .AddConstructor<SixLowPanFrag1> ();
   return tid;
 }
 
@@ -635,7 +641,10 @@
  */
 TypeId SixLowPanFragN::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::SixLowPanFragN").SetParent<Header> ().AddConstructor<SixLowPanFragN> ();
+  static TypeId tid = TypeId ("ns3::SixLowPanFragN")
+    .SetParent<Header> ()
+    .SetGroupName ("SixLowPan")
+    .AddConstructor<SixLowPanFragN> ();
   return tid;
 }
 
@@ -729,7 +738,10 @@
 
 TypeId SixLowPanIpv6::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::SixLowPanIpv6").SetParent<Header> ().AddConstructor<SixLowPanIpv6> ();
+  static TypeId tid = TypeId ("ns3::SixLowPanIpv6")
+    .SetParent<Header> ()
+    .SetGroupName ("SixLowPan")
+    .AddConstructor<SixLowPanIpv6> ();
   return tid;
 }
 
@@ -789,7 +801,10 @@
 
 TypeId SixLowPanIphc::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::SixLowPanIphc").SetParent<Header> ().AddConstructor<SixLowPanIphc> ();
+  static TypeId tid = TypeId ("ns3::SixLowPanIphc")
+    .SetParent<Header> ()
+    .SetGroupName ("SixLowPan")
+    .AddConstructor<SixLowPanIphc> ();
   return tid;
 }
 
@@ -1481,6 +1496,7 @@
 {
   static TypeId tid = TypeId ("ns3::SixLowPanNhcExtension")
     .SetParent<Header> ()
+    .SetGroupName ("SixLowPan")
     .AddConstructor<SixLowPanNhcExtension> ();
   return tid;
 }
@@ -1609,6 +1625,7 @@
 {
   static TypeId tid = TypeId ("ns3::SixLowPanUdpNhcExtension")
     .SetParent<Header> ()
+    .SetGroupName ("SixLowPan")
     .AddConstructor<SixLowPanUdpNhcExtension> ();
   return tid;
 }
diff -Naur ns-3.22/src/sixlowpan/model/sixlowpan-header.h ns-3.23/src/sixlowpan/model/sixlowpan-header.h
--- ns-3.22/src/sixlowpan/model/sixlowpan-header.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/sixlowpan/model/sixlowpan-header.h	2015-05-13 11:05:26.000000000 -0700
@@ -346,13 +346,13 @@
   uint8_t m_hopLimit;           //!< Hop Limit
   uint8_t m_srcPrefix[8];       //!< Source prefix
   uint8_t m_srcInterface[8];    //!< Source interface
-  uint8_t m_dstPrefix[8];       //!< Destinaiton prefix
+  uint8_t m_dstPrefix[8];       //!< Destination prefix
   uint8_t m_dstInterface[8];    //!< Destination interface
   uint8_t m_trafficClass;       //!< Traffic Class
   uint32_t m_flowLabel;         //!< Flow Label
   uint8_t m_nextHeader;         //!< Next header
-  LowPanHc1Addr_e m_srcCompression; //!< Source compresison type
-  LowPanHc1Addr_e m_dstCompression; //!< Destination compresison type
+  LowPanHc1Addr_e m_srcCompression; //!< Source compression type
+  LowPanHc1Addr_e m_dstCompression; //!< Destination compression type
   bool m_tcflCompression;       //!< is TC and FL compressed
   LowPanHc1NextHeader_e m_nextHeaderCompression; //!< next header compression
   bool m_hc2HeaderPresent;      //!< is next header HC2 compressed
@@ -544,7 +544,7 @@
 
 /**
  * \ingroup sixlowpan
- * \brief 6LoWPAN IPv6 uncomprssed header - see RFC 4944
+ * \brief 6LoWPAN IPv6 uncompressed header - see RFC 4944
  */
 class SixLowPanIpv6 : public Header
 {
diff -Naur ns-3.22/src/sixlowpan/model/sixlowpan-net-device.cc ns-3.23/src/sixlowpan/model/sixlowpan-net-device.cc
--- ns-3.22/src/sixlowpan/model/sixlowpan-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/sixlowpan/model/sixlowpan-net-device.cc	2015-05-13 11:05:26.000000000 -0700
@@ -50,6 +50,7 @@
 {
   static TypeId tid = TypeId ("ns3::SixLowPanNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("SixLowPan")
     .AddConstructor<SixLowPanNetDevice> ()
     .AddAttribute ("Rfc6282", "Use RFC6282 (IPHC) if true, RFC4944 (HC1) otherwise.",
                    BooleanValue (true),
diff -Naur ns-3.22/src/spectrum/bindings/modulegen__gcc_ILP32.py ns-3.23/src/spectrum/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/spectrum/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:26.000000000 -0700
@@ -26,6 +26,8 @@
     module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address'], import_from_module='ns.network')
     ## adhoc-aloha-noack-ideal-phy-helper.h (module 'spectrum'): ns3::AdhocAlohaNoackIdealPhyHelper [class]
     module.add_class('AdhocAlohaNoackIdealPhyHelper')
+    ## angles.h (module 'antenna'): ns3::Angles [struct]
+    module.add_class('Angles', import_from_module='ns.antenna')
     ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList [class]
     module.add_class('AttributeConstructionList', import_from_module='ns.core')
     ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item [struct]
@@ -126,6 +128,12 @@
     module.add_class('TagBuffer', import_from_module='ns.network')
     ## nstime.h (module 'core'): ns3::TimeWithUnit [class]
     module.add_class('TimeWithUnit', import_from_module='ns.core')
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper [class]
+    module.add_class('TvSpectrumTransmitterHelper')
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper::Region [enumeration]
+    module.add_enum('Region', ['REGION_NORTH_AMERICA', 'REGION_JAPAN', 'REGION_EUROPE'], outer_class=root_module['ns3::TvSpectrumTransmitterHelper'])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper::Density [enumeration]
+    module.add_enum('Density', ['DENSITY_LOW', 'DENSITY_MEDIUM', 'DENSITY_HIGH'], outer_class=root_module['ns3::TvSpectrumTransmitterHelper'])
     ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::TxSpectrumModelInfo [class]
     module.add_class('TxSpectrumModelInfo')
     ## type-id.h (module 'core'): ns3::TypeId [class]
@@ -234,6 +242,10 @@
     module.add_class('Trailer', import_from_module='ns.network', parent=root_module['ns3::Chunk'])
     ## random-variable-stream.h (module 'core'): ns3::TriangularRandomVariable [class]
     module.add_class('TriangularRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::TvSpectrumTransmitter [class]
+    module.add_class('TvSpectrumTransmitter', parent=root_module['ns3::SpectrumPhy'])
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::TvSpectrumTransmitter::TvType [enumeration]
+    module.add_enum('TvType', ['TVTYPE_ANALOG', 'TVTYPE_8VSB', 'TVTYPE_COFDM'], outer_class=root_module['ns3::TvSpectrumTransmitter'])
     ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel [class]
     module.add_class('TwoRayGroundPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel'])
     ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable [class]
@@ -248,6 +260,8 @@
     module.add_class('ZipfRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## aloha-noack-mac-header.h (module 'spectrum'): ns3::AlohaNoackMacHeader [class]
     module.add_class('AlohaNoackMacHeader', parent=root_module['ns3::Header'])
+    ## antenna-model.h (module 'antenna'): ns3::AntennaModel [class]
+    module.add_class('AntennaModel', import_from_module='ns.antenna', parent=root_module['ns3::Object'])
     ## attribute.h (module 'core'): ns3::AttributeAccessor [class]
     module.add_class('AttributeAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >'])
     ## attribute.h (module 'core'): ns3::AttributeChecker [class]
@@ -498,6 +512,7 @@
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AdhocAlohaNoackIdealPhyHelper_methods(root_module, root_module['ns3::AdhocAlohaNoackIdealPhyHelper'])
+    register_Ns3Angles_methods(root_module, root_module['ns3::Angles'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
     register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
     register_Ns3BandInfo_methods(root_module, root_module['ns3::BandInfo'])
@@ -541,6 +556,7 @@
     register_Ns3Tag_methods(root_module, root_module['ns3::Tag'])
     register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
     register_Ns3TimeWithUnit_methods(root_module, root_module['ns3::TimeWithUnit'])
+    register_Ns3TvSpectrumTransmitterHelper_methods(root_module, root_module['ns3::TvSpectrumTransmitterHelper'])
     register_Ns3TxSpectrumModelInfo_methods(root_module, root_module['ns3::TxSpectrumModelInfo'])
     register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId'])
     register_Ns3TypeIdAttributeInformation_methods(root_module, root_module['ns3::TypeId::AttributeInformation'])
@@ -590,6 +606,7 @@
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
     register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
     register_Ns3TriangularRandomVariable_methods(root_module, root_module['ns3::TriangularRandomVariable'])
+    register_Ns3TvSpectrumTransmitter_methods(root_module, root_module['ns3::TvSpectrumTransmitter'])
     register_Ns3TwoRayGroundPropagationLossModel_methods(root_module, root_module['ns3::TwoRayGroundPropagationLossModel'])
     register_Ns3UniformRandomVariable_methods(root_module, root_module['ns3::UniformRandomVariable'])
     register_Ns3WaveformGenerator_methods(root_module, root_module['ns3::WaveformGenerator'])
@@ -597,6 +614,7 @@
     register_Ns3ZetaRandomVariable_methods(root_module, root_module['ns3::ZetaRandomVariable'])
     register_Ns3ZipfRandomVariable_methods(root_module, root_module['ns3::ZipfRandomVariable'])
     register_Ns3AlohaNoackMacHeader_methods(root_module, root_module['ns3::AlohaNoackMacHeader'])
+    register_Ns3AntennaModel_methods(root_module, root_module['ns3::AntennaModel'])
     register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
     register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker'])
     register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue'])
@@ -791,6 +809,24 @@
                    [param('ns3::Ptr< ns3::SpectrumValue >', 'txPsd')])
     return
 
+def register_Ns3Angles_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## angles.h (module 'antenna'): ns3::Angles::Angles(ns3::Angles const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Angles const &', 'arg0')])
+    ## angles.h (module 'antenna'): ns3::Angles::Angles() [constructor]
+    cls.add_constructor([])
+    ## angles.h (module 'antenna'): ns3::Angles::Angles(double phi, double theta) [constructor]
+    cls.add_constructor([param('double', 'phi'), param('double', 'theta')])
+    ## angles.h (module 'antenna'): ns3::Angles::Angles(ns3::Vector v) [constructor]
+    cls.add_constructor([param('ns3::Vector', 'v')])
+    ## angles.h (module 'antenna'): ns3::Angles::Angles(ns3::Vector v, ns3::Vector o) [constructor]
+    cls.add_constructor([param('ns3::Vector', 'v'), param('ns3::Vector', 'o')])
+    ## angles.h (module 'antenna'): ns3::Angles::phi [variable]
+    cls.add_instance_attribute('phi', 'double', is_const=False)
+    ## angles.h (module 'antenna'): ns3::Angles::theta [variable]
+    cls.add_instance_attribute('theta', 'double', is_const=False)
+    return
+
 def register_Ns3AttributeConstructionList_methods(root_module, cls):
     ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::AttributeConstructionList(ns3::AttributeConstructionList const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::AttributeConstructionList const &', 'arg0')])
@@ -1236,11 +1272,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
@@ -2597,6 +2643,45 @@
     cls.add_constructor([param('ns3::Time const', 'time'), param('ns3::Time::Unit const', 'unit')])
     return
 
+def register_Ns3TvSpectrumTransmitterHelper_methods(root_module, cls):
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper::TvSpectrumTransmitterHelper(ns3::TvSpectrumTransmitterHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TvSpectrumTransmitterHelper const &', 'arg0')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper::TvSpectrumTransmitterHelper() [constructor]
+    cls.add_constructor([])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): int64_t ns3::TvSpectrumTransmitterHelper::AssignStreams(int64_t streamNum) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'streamNum')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): void ns3::TvSpectrumTransmitterHelper::CreateRegionalTvTransmitters(ns3::TvSpectrumTransmitterHelper::Region region, ns3::TvSpectrumTransmitterHelper::Density density, double originLatitude, double originLongitude, double maxAltitude, double maxRadius) [member function]
+    cls.add_method('CreateRegionalTvTransmitters', 
+                   'void', 
+                   [param('ns3::TvSpectrumTransmitterHelper::Region', 'region'), param('ns3::TvSpectrumTransmitterHelper::Density', 'density'), param('double', 'originLatitude'), param('double', 'originLongitude'), param('double', 'maxAltitude'), param('double', 'maxRadius')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::NetDeviceContainer ns3::TvSpectrumTransmitterHelper::Install(ns3::NodeContainer nodes) [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NodeContainer', 'nodes')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::NetDeviceContainer ns3::TvSpectrumTransmitterHelper::Install(ns3::NodeContainer nodes, ns3::TvSpectrumTransmitterHelper::Region region, uint16_t channelNumber) [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NodeContainer', 'nodes'), param('ns3::TvSpectrumTransmitterHelper::Region', 'region'), param('uint16_t', 'channelNumber')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::NetDeviceContainer ns3::TvSpectrumTransmitterHelper::InstallAdjacent(ns3::NodeContainer nodes) [member function]
+    cls.add_method('InstallAdjacent', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NodeContainer', 'nodes')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::NetDeviceContainer ns3::TvSpectrumTransmitterHelper::InstallAdjacent(ns3::NodeContainer nodes, ns3::TvSpectrumTransmitterHelper::Region region, uint16_t channelNumber) [member function]
+    cls.add_method('InstallAdjacent', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NodeContainer', 'nodes'), param('ns3::TvSpectrumTransmitterHelper::Region', 'region'), param('uint16_t', 'channelNumber')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): void ns3::TvSpectrumTransmitterHelper::SetAttribute(std::string name, ns3::AttributeValue const & val) [member function]
+    cls.add_method('SetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'val')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): void ns3::TvSpectrumTransmitterHelper::SetChannel(ns3::Ptr<ns3::SpectrumChannel> c) [member function]
+    cls.add_method('SetChannel', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::SpectrumChannel >', 'c')])
+    return
+
 def register_Ns3TxSpectrumModelInfo_methods(root_module, cls):
     ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::TxSpectrumModelInfo::TxSpectrumModelInfo(ns3::TxSpectrumModelInfo const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::TxSpectrumModelInfo const &', 'arg0')])
@@ -4179,6 +4264,86 @@
                    is_virtual=True)
     return
 
+def register_Ns3TvSpectrumTransmitter_methods(root_module, cls):
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::TvSpectrumTransmitter::TvSpectrumTransmitter() [constructor]
+    cls.add_constructor([])
+    ## tv-spectrum-transmitter.h (module 'spectrum'): static ns3::TypeId ns3::TvSpectrumTransmitter::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::SetChannel(ns3::Ptr<ns3::SpectrumChannel> c) [member function]
+    cls.add_method('SetChannel', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::SpectrumChannel >', 'c')], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::SetMobility(ns3::Ptr<ns3::MobilityModel> m) [member function]
+    cls.add_method('SetMobility', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MobilityModel >', 'm')], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::SetDevice(ns3::Ptr<ns3::NetDevice> d) [member function]
+    cls.add_method('SetDevice', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'd')], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::MobilityModel> ns3::TvSpectrumTransmitter::GetMobility() [member function]
+    cls.add_method('GetMobility', 
+                   'ns3::Ptr< ns3::MobilityModel >', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::NetDevice> ns3::TvSpectrumTransmitter::GetDevice() [member function]
+    cls.add_method('GetDevice', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::SpectrumModel const> ns3::TvSpectrumTransmitter::GetRxSpectrumModel() const [member function]
+    cls.add_method('GetRxSpectrumModel', 
+                   'ns3::Ptr< ns3::SpectrumModel const >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::AntennaModel> ns3::TvSpectrumTransmitter::GetRxAntenna() [member function]
+    cls.add_method('GetRxAntenna', 
+                   'ns3::Ptr< ns3::AntennaModel >', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::StartRx(ns3::Ptr<ns3::SpectrumSignalParameters> params) [member function]
+    cls.add_method('StartRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::SpectrumChannel> ns3::TvSpectrumTransmitter::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::SpectrumChannel >', 
+                   [], 
+                   is_const=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::CreateTvPsd() [member function]
+    cls.add_method('CreateTvPsd', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::SpectrumValue> ns3::TvSpectrumTransmitter::GetTxPsd() const [member function]
+    cls.add_method('GetTxPsd', 
+                   'ns3::Ptr< ns3::SpectrumValue >', 
+                   [], 
+                   is_const=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::Start() [member function]
+    cls.add_method('Start', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::Stop() [member function]
+    cls.add_method('Stop', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::SetupTx() [member function]
+    cls.add_method('SetupTx', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
 def register_Ns3TwoRayGroundPropagationLossModel_methods(root_module, cls):
     ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::TwoRayGroundPropagationLossModel::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -4533,6 +4698,23 @@
                    [param('ns3::Mac48Address', 'source')])
     return
 
+def register_Ns3AntennaModel_methods(root_module, cls):
+    ## antenna-model.h (module 'antenna'): ns3::AntennaModel::AntennaModel(ns3::AntennaModel const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AntennaModel const &', 'arg0')])
+    ## antenna-model.h (module 'antenna'): ns3::AntennaModel::AntennaModel() [constructor]
+    cls.add_constructor([])
+    ## antenna-model.h (module 'antenna'): double ns3::AntennaModel::GetGainDb(ns3::Angles a) [member function]
+    cls.add_method('GetGainDb', 
+                   'double', 
+                   [param('ns3::Angles', 'a')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## antenna-model.h (module 'antenna'): static ns3::TypeId ns3::AntennaModel::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3AttributeAccessor_methods(root_module, cls):
     ## attribute.h (module 'core'): ns3::AttributeAccessor::AttributeAccessor(ns3::AttributeAccessor const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::AttributeAccessor const &', 'arg0')])
diff -Naur ns-3.22/src/spectrum/bindings/modulegen__gcc_LP64.py ns-3.23/src/spectrum/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/spectrum/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:26.000000000 -0700
@@ -26,6 +26,8 @@
     module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address'], import_from_module='ns.network')
     ## adhoc-aloha-noack-ideal-phy-helper.h (module 'spectrum'): ns3::AdhocAlohaNoackIdealPhyHelper [class]
     module.add_class('AdhocAlohaNoackIdealPhyHelper')
+    ## angles.h (module 'antenna'): ns3::Angles [struct]
+    module.add_class('Angles', import_from_module='ns.antenna')
     ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList [class]
     module.add_class('AttributeConstructionList', import_from_module='ns.core')
     ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::Item [struct]
@@ -126,6 +128,12 @@
     module.add_class('TagBuffer', import_from_module='ns.network')
     ## nstime.h (module 'core'): ns3::TimeWithUnit [class]
     module.add_class('TimeWithUnit', import_from_module='ns.core')
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper [class]
+    module.add_class('TvSpectrumTransmitterHelper')
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper::Region [enumeration]
+    module.add_enum('Region', ['REGION_NORTH_AMERICA', 'REGION_JAPAN', 'REGION_EUROPE'], outer_class=root_module['ns3::TvSpectrumTransmitterHelper'])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper::Density [enumeration]
+    module.add_enum('Density', ['DENSITY_LOW', 'DENSITY_MEDIUM', 'DENSITY_HIGH'], outer_class=root_module['ns3::TvSpectrumTransmitterHelper'])
     ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::TxSpectrumModelInfo [class]
     module.add_class('TxSpectrumModelInfo')
     ## type-id.h (module 'core'): ns3::TypeId [class]
@@ -234,6 +242,10 @@
     module.add_class('Trailer', import_from_module='ns.network', parent=root_module['ns3::Chunk'])
     ## random-variable-stream.h (module 'core'): ns3::TriangularRandomVariable [class]
     module.add_class('TriangularRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::TvSpectrumTransmitter [class]
+    module.add_class('TvSpectrumTransmitter', parent=root_module['ns3::SpectrumPhy'])
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::TvSpectrumTransmitter::TvType [enumeration]
+    module.add_enum('TvType', ['TVTYPE_ANALOG', 'TVTYPE_8VSB', 'TVTYPE_COFDM'], outer_class=root_module['ns3::TvSpectrumTransmitter'])
     ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel [class]
     module.add_class('TwoRayGroundPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel'])
     ## random-variable-stream.h (module 'core'): ns3::UniformRandomVariable [class]
@@ -248,6 +260,8 @@
     module.add_class('ZipfRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## aloha-noack-mac-header.h (module 'spectrum'): ns3::AlohaNoackMacHeader [class]
     module.add_class('AlohaNoackMacHeader', parent=root_module['ns3::Header'])
+    ## antenna-model.h (module 'antenna'): ns3::AntennaModel [class]
+    module.add_class('AntennaModel', import_from_module='ns.antenna', parent=root_module['ns3::Object'])
     ## attribute.h (module 'core'): ns3::AttributeAccessor [class]
     module.add_class('AttributeAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >'])
     ## attribute.h (module 'core'): ns3::AttributeChecker [class]
@@ -498,6 +512,7 @@
 def register_methods(root_module):
     register_Ns3Address_methods(root_module, root_module['ns3::Address'])
     register_Ns3AdhocAlohaNoackIdealPhyHelper_methods(root_module, root_module['ns3::AdhocAlohaNoackIdealPhyHelper'])
+    register_Ns3Angles_methods(root_module, root_module['ns3::Angles'])
     register_Ns3AttributeConstructionList_methods(root_module, root_module['ns3::AttributeConstructionList'])
     register_Ns3AttributeConstructionListItem_methods(root_module, root_module['ns3::AttributeConstructionList::Item'])
     register_Ns3BandInfo_methods(root_module, root_module['ns3::BandInfo'])
@@ -541,6 +556,7 @@
     register_Ns3Tag_methods(root_module, root_module['ns3::Tag'])
     register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
     register_Ns3TimeWithUnit_methods(root_module, root_module['ns3::TimeWithUnit'])
+    register_Ns3TvSpectrumTransmitterHelper_methods(root_module, root_module['ns3::TvSpectrumTransmitterHelper'])
     register_Ns3TxSpectrumModelInfo_methods(root_module, root_module['ns3::TxSpectrumModelInfo'])
     register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId'])
     register_Ns3TypeIdAttributeInformation_methods(root_module, root_module['ns3::TypeId::AttributeInformation'])
@@ -590,6 +606,7 @@
     register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor'])
     register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
     register_Ns3TriangularRandomVariable_methods(root_module, root_module['ns3::TriangularRandomVariable'])
+    register_Ns3TvSpectrumTransmitter_methods(root_module, root_module['ns3::TvSpectrumTransmitter'])
     register_Ns3TwoRayGroundPropagationLossModel_methods(root_module, root_module['ns3::TwoRayGroundPropagationLossModel'])
     register_Ns3UniformRandomVariable_methods(root_module, root_module['ns3::UniformRandomVariable'])
     register_Ns3WaveformGenerator_methods(root_module, root_module['ns3::WaveformGenerator'])
@@ -597,6 +614,7 @@
     register_Ns3ZetaRandomVariable_methods(root_module, root_module['ns3::ZetaRandomVariable'])
     register_Ns3ZipfRandomVariable_methods(root_module, root_module['ns3::ZipfRandomVariable'])
     register_Ns3AlohaNoackMacHeader_methods(root_module, root_module['ns3::AlohaNoackMacHeader'])
+    register_Ns3AntennaModel_methods(root_module, root_module['ns3::AntennaModel'])
     register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
     register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker'])
     register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue'])
@@ -791,6 +809,24 @@
                    [param('ns3::Ptr< ns3::SpectrumValue >', 'txPsd')])
     return
 
+def register_Ns3Angles_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## angles.h (module 'antenna'): ns3::Angles::Angles(ns3::Angles const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::Angles const &', 'arg0')])
+    ## angles.h (module 'antenna'): ns3::Angles::Angles() [constructor]
+    cls.add_constructor([])
+    ## angles.h (module 'antenna'): ns3::Angles::Angles(double phi, double theta) [constructor]
+    cls.add_constructor([param('double', 'phi'), param('double', 'theta')])
+    ## angles.h (module 'antenna'): ns3::Angles::Angles(ns3::Vector v) [constructor]
+    cls.add_constructor([param('ns3::Vector', 'v')])
+    ## angles.h (module 'antenna'): ns3::Angles::Angles(ns3::Vector v, ns3::Vector o) [constructor]
+    cls.add_constructor([param('ns3::Vector', 'v'), param('ns3::Vector', 'o')])
+    ## angles.h (module 'antenna'): ns3::Angles::phi [variable]
+    cls.add_instance_attribute('phi', 'double', is_const=False)
+    ## angles.h (module 'antenna'): ns3::Angles::theta [variable]
+    cls.add_instance_attribute('theta', 'double', is_const=False)
+    return
+
 def register_Ns3AttributeConstructionList_methods(root_module, cls):
     ## attribute-construction-list.h (module 'core'): ns3::AttributeConstructionList::AttributeConstructionList(ns3::AttributeConstructionList const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::AttributeConstructionList const &', 'arg0')])
@@ -1236,11 +1272,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
@@ -2597,6 +2643,45 @@
     cls.add_constructor([param('ns3::Time const', 'time'), param('ns3::Time::Unit const', 'unit')])
     return
 
+def register_Ns3TvSpectrumTransmitterHelper_methods(root_module, cls):
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper::TvSpectrumTransmitterHelper(ns3::TvSpectrumTransmitterHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::TvSpectrumTransmitterHelper const &', 'arg0')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::TvSpectrumTransmitterHelper::TvSpectrumTransmitterHelper() [constructor]
+    cls.add_constructor([])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): int64_t ns3::TvSpectrumTransmitterHelper::AssignStreams(int64_t streamNum) [member function]
+    cls.add_method('AssignStreams', 
+                   'int64_t', 
+                   [param('int64_t', 'streamNum')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): void ns3::TvSpectrumTransmitterHelper::CreateRegionalTvTransmitters(ns3::TvSpectrumTransmitterHelper::Region region, ns3::TvSpectrumTransmitterHelper::Density density, double originLatitude, double originLongitude, double maxAltitude, double maxRadius) [member function]
+    cls.add_method('CreateRegionalTvTransmitters', 
+                   'void', 
+                   [param('ns3::TvSpectrumTransmitterHelper::Region', 'region'), param('ns3::TvSpectrumTransmitterHelper::Density', 'density'), param('double', 'originLatitude'), param('double', 'originLongitude'), param('double', 'maxAltitude'), param('double', 'maxRadius')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::NetDeviceContainer ns3::TvSpectrumTransmitterHelper::Install(ns3::NodeContainer nodes) [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NodeContainer', 'nodes')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::NetDeviceContainer ns3::TvSpectrumTransmitterHelper::Install(ns3::NodeContainer nodes, ns3::TvSpectrumTransmitterHelper::Region region, uint16_t channelNumber) [member function]
+    cls.add_method('Install', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NodeContainer', 'nodes'), param('ns3::TvSpectrumTransmitterHelper::Region', 'region'), param('uint16_t', 'channelNumber')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::NetDeviceContainer ns3::TvSpectrumTransmitterHelper::InstallAdjacent(ns3::NodeContainer nodes) [member function]
+    cls.add_method('InstallAdjacent', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NodeContainer', 'nodes')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): ns3::NetDeviceContainer ns3::TvSpectrumTransmitterHelper::InstallAdjacent(ns3::NodeContainer nodes, ns3::TvSpectrumTransmitterHelper::Region region, uint16_t channelNumber) [member function]
+    cls.add_method('InstallAdjacent', 
+                   'ns3::NetDeviceContainer', 
+                   [param('ns3::NodeContainer', 'nodes'), param('ns3::TvSpectrumTransmitterHelper::Region', 'region'), param('uint16_t', 'channelNumber')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): void ns3::TvSpectrumTransmitterHelper::SetAttribute(std::string name, ns3::AttributeValue const & val) [member function]
+    cls.add_method('SetAttribute', 
+                   'void', 
+                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'val')])
+    ## tv-spectrum-transmitter-helper.h (module 'spectrum'): void ns3::TvSpectrumTransmitterHelper::SetChannel(ns3::Ptr<ns3::SpectrumChannel> c) [member function]
+    cls.add_method('SetChannel', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::SpectrumChannel >', 'c')])
+    return
+
 def register_Ns3TxSpectrumModelInfo_methods(root_module, cls):
     ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::TxSpectrumModelInfo::TxSpectrumModelInfo(ns3::TxSpectrumModelInfo const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::TxSpectrumModelInfo const &', 'arg0')])
@@ -4179,6 +4264,86 @@
                    is_virtual=True)
     return
 
+def register_Ns3TvSpectrumTransmitter_methods(root_module, cls):
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::TvSpectrumTransmitter::TvSpectrumTransmitter() [constructor]
+    cls.add_constructor([])
+    ## tv-spectrum-transmitter.h (module 'spectrum'): static ns3::TypeId ns3::TvSpectrumTransmitter::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::SetChannel(ns3::Ptr<ns3::SpectrumChannel> c) [member function]
+    cls.add_method('SetChannel', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::SpectrumChannel >', 'c')], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::SetMobility(ns3::Ptr<ns3::MobilityModel> m) [member function]
+    cls.add_method('SetMobility', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::MobilityModel >', 'm')], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::SetDevice(ns3::Ptr<ns3::NetDevice> d) [member function]
+    cls.add_method('SetDevice', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'd')], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::MobilityModel> ns3::TvSpectrumTransmitter::GetMobility() [member function]
+    cls.add_method('GetMobility', 
+                   'ns3::Ptr< ns3::MobilityModel >', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::NetDevice> ns3::TvSpectrumTransmitter::GetDevice() [member function]
+    cls.add_method('GetDevice', 
+                   'ns3::Ptr< ns3::NetDevice >', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::SpectrumModel const> ns3::TvSpectrumTransmitter::GetRxSpectrumModel() const [member function]
+    cls.add_method('GetRxSpectrumModel', 
+                   'ns3::Ptr< ns3::SpectrumModel const >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::AntennaModel> ns3::TvSpectrumTransmitter::GetRxAntenna() [member function]
+    cls.add_method('GetRxAntenna', 
+                   'ns3::Ptr< ns3::AntennaModel >', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::StartRx(ns3::Ptr<ns3::SpectrumSignalParameters> params) [member function]
+    cls.add_method('StartRx', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::SpectrumSignalParameters >', 'params')], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::SpectrumChannel> ns3::TvSpectrumTransmitter::GetChannel() const [member function]
+    cls.add_method('GetChannel', 
+                   'ns3::Ptr< ns3::SpectrumChannel >', 
+                   [], 
+                   is_const=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::CreateTvPsd() [member function]
+    cls.add_method('CreateTvPsd', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): ns3::Ptr<ns3::SpectrumValue> ns3::TvSpectrumTransmitter::GetTxPsd() const [member function]
+    cls.add_method('GetTxPsd', 
+                   'ns3::Ptr< ns3::SpectrumValue >', 
+                   [], 
+                   is_const=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::Start() [member function]
+    cls.add_method('Start', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::Stop() [member function]
+    cls.add_method('Stop', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## tv-spectrum-transmitter.h (module 'spectrum'): void ns3::TvSpectrumTransmitter::SetupTx() [member function]
+    cls.add_method('SetupTx', 
+                   'void', 
+                   [], 
+                   visibility='private', is_virtual=True)
+    return
+
 def register_Ns3TwoRayGroundPropagationLossModel_methods(root_module, cls):
     ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::TwoRayGroundPropagationLossModel::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
@@ -4533,6 +4698,23 @@
                    [param('ns3::Mac48Address', 'source')])
     return
 
+def register_Ns3AntennaModel_methods(root_module, cls):
+    ## antenna-model.h (module 'antenna'): ns3::AntennaModel::AntennaModel(ns3::AntennaModel const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AntennaModel const &', 'arg0')])
+    ## antenna-model.h (module 'antenna'): ns3::AntennaModel::AntennaModel() [constructor]
+    cls.add_constructor([])
+    ## antenna-model.h (module 'antenna'): double ns3::AntennaModel::GetGainDb(ns3::Angles a) [member function]
+    cls.add_method('GetGainDb', 
+                   'double', 
+                   [param('ns3::Angles', 'a')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## antenna-model.h (module 'antenna'): static ns3::TypeId ns3::AntennaModel::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    return
+
 def register_Ns3AttributeAccessor_methods(root_module, cls):
     ## attribute.h (module 'core'): ns3::AttributeAccessor::AttributeAccessor(ns3::AttributeAccessor const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::AttributeAccessor const &', 'arg0')])
diff -Naur ns-3.22/src/spectrum/doc/spectrum.rst ns-3.23/src/spectrum/doc/spectrum.rst
--- ns-3.22/src/spectrum/doc/spectrum.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/doc/spectrum.rst	2015-05-13 11:05:26.000000000 -0700
@@ -437,3 +437,168 @@
 
 
 
+Additional Models
+*****************
+
+TV Transmitter Model
+====================
+
+A TV Transmitter model is implemented by the ``TvSpectrumTransmitter`` class.
+This model enables transmission of realistic TV signals to be simulated and can 
+be used for interference modeling. It provides a customizable power spectral 
+density (PSD) model, with configurable attributes including the type of 
+modulation (with models for analog, 8-VSB, and COFDM), signal bandwidth, 
+power spectral density level, frequency, and transmission duration. A helper 
+class, ``TvSpectrumTransmitterHelper``, is also provided to assist users in 
+setting up simulations.
+
+Main Model Class
+################
+
+The main TV Transmitter model class, ``TvSpectrumTransmitter``, provides a 
+user-configurable PSD model that can be transmitted on the ``SpectrumChannel``. 
+It inherits from ``SpectrumPhy`` and is comprised of attributes and methods to 
+create and transmit the signal on the channel.
+
+.. _spectrum-tv-cofdm:
+ 
+.. figure:: figures/spectrum-tv-cofdm.*
+   :align: center
+
+   8K COFDM signal spectrum generated from ``TvSpectrumTransmitter`` (Left) and 
+   theoretical COFDM signal spectrum [KoppCOFDM] (Right)
+
+One of the user-configurable attributes is the type of modulation for the TV 
+transmitter to use. The options are 8-VSB (Eight-Level Vestigial Sideband 
+Modulation) which is notably used in the North America ATSC digital television 
+standard, COFDM (Coded Orthogonal Frequency Division Multiplexing) which is 
+notably used in the DVB-T and ISDB-T digital television standards adopted by 
+various countries around the world, and analog modulation which is a legacy 
+technology but is still being used by some countries today. To accomplish 
+realistic PSD models for these modulation types, the signals’ PSDs were 
+approximated from real standards and developed into models that are scalable by 
+frequency and power. The COFDM PSD is approximated from Figure 12 (8k mode) of 
+[KoppCOFDM], the 8-VSB PSD is approximated from Figure 3 of [Baron8VSB], and the 
+analog PSD is approximated from Figure 4 of [QualcommAnalog]. Note that the 
+analog model is approximated from the NTSC standard, but other analog modulation 
+standards such as PAL have similar signals. The approximated COFDM PSD model is 
+in 8K mode. The other configurable attributes are the start frequency, 
+signal/channel bandwidth, base PSD, antenna type, starting time, 
+and transmit duration.
+
+``TvSpectrumTransmitter`` uses ``IsotropicAntennaModel`` as its antenna model by 
+default, but any model that inherits from ``AntennaModel`` is selectable, so 
+directional antenna models can also be used. The propagation loss models used 
+in simulation are configured in the ``SpectrumChannel`` that the user chooses to 
+use. Terrain and spherical Earth/horizon effects may be supported in future ns-3 
+propagation loss models.
+
+After the attributes are set, along with the ``SpectrumChannel``, 
+``MobilityModel``, and node locations, the PSD of the TV transmitter signal can 
+be created and transmitted on the channel.
+
+.. _sec-tv-helper-class:
+
+Helper Class
+############
+
+The helper class, ``TvSpectrumTransmitterHelper``, consists of features to 
+assist users in setting up TV transmitters for their simulations. Functionality 
+is also provided to easily simulate real-world scenarios. 
+
+.. _spectrum-tv-8vsb:
+ 
+.. figure:: figures/spectrum-tv-8vsb.*
+   :align: center
+
+   North America ATSC channel 19 & 20 signals generated using 
+   ``TvSpectrumTransmitterHelper`` (Left) and theoretical 8-VSB signal 
+   [Baron8VSB] (Right). Note that the theoretical signal is not shown in dB 
+   while the ns-3 generated signals are.
+
+Using this helper class, users can easily set up TV transmitters right after 
+configuring attributes. Multiple transmitters can be created at a time. Also 
+included are real characteristics of specific geographic regions that can be 
+used to run realistic simulations. The regions currently included are 
+North America, Europe, and Japan. The frequencies and bandwidth of each TV 
+channel for each these regions are provided.
+
+.. _spectrum-tv-rand-geo-points:
+ 
+.. figure:: figures/spectrum-tv-rand-geo-points.*
+   :align: center
+
+   Plot from MATLAB implementation of CreateRegionalTvTransmitters method in 
+   ``TvSpectrumTransmitterHelper``. Shows 100 random points on Earth’s surface 
+   (with altitude 0) corresponding to TV transmitter locations within a 2000 km 
+   radius of 35° latitude and -100° longitude.
+
+A method (CreateRegionalTvTransmitters) is provided that enables users to 
+randomly generate multiple TV transmitters from a specified region with a given 
+density within a chosen radius around a point on Earth’s surface. The region, 
+which determines the channel frequencies of the generated TV transmitters, can 
+be specified to be one of the three provided, while the density determines the 
+amount of transmitters generated. The TV transmitters' antenna heights 
+(altitude) above Earth's surface can also be randomly generated to be within a 
+given maximum altitude. This method models Earth as a perfect sphere, and 
+generated location points are referenced accordingly in Earth-Centered 
+Earth-Fixed Cartesian coordinates. Note that bodies of water on Earth are not 
+considered in location point generation--TV transmitters can be generated 
+anywhere on Earth around the origin point within the chosen maximum radius.
+
+Examples
+########
+
+Two example simulations are provided that demonstrate the functionality of the 
+TV transmitter model. ``tv-trans-example`` simulates two 8-VSB TV transmitters 
+with adjacent channel frequencies. ``tv-trans-regional-example`` simulates 
+randomly generated COFDM TV transmitters (modeling the DVB-T standard)  
+located around the Paris, France area with channel frequencies and bandwidths 
+corresponding to the European television channel allocations.
+
+Testing
+#######
+
+The ``tv-spectrum-transmitter`` test suite verifies the accuracy of the 
+spectrum/PSD model in ``TvSpectrumTransmitter`` by testing if the maximum power 
+spectral density, start frequency, and end frequency comply with expected values 
+for various test cases.
+
+The ``tv-helper-distribution`` test suite verifies the functionality of the 
+method in ``TvSpectrumTransmitterHelper`` that generates a random number of TV 
+transmitters based on the given density (low, medium, or high) and maximum 
+number of TV channels. It verifies that the number of TV transmitters generated 
+does not exceed the expected bounds.
+
+The CreateRegionalTvTransmitters method in ``TvSpectrumTransmitterHelper`` 
+described in :ref:`sec-tv-helper-class` uses two methods from the 
+``GeographicPositions`` class in the Mobility module to generate the random 
+Cartesian points on or above earth's surface around an origin point which 
+correspond to TV transmitter positions. The first method converts Earth 
+geographic coordinates to Earth-Centered Earth-Fixed (ECEF) Cartesian 
+coordinates, and is tested in the ``geo-to-cartesian`` test suite by comparing 
+(with 10 meter tolerance) its output with the output of the geographic to ECEF 
+conversion function [MatlabGeo] of the MATLAB Mapping Toolbox for numerous 
+test cases. The other used method generates random ECEF Cartesian points around 
+the given geographic origin point, and is tested in the ``rand-cart-around-geo`` 
+test suite by verifying that the generated points do not exceed the given 
+maximum distance radius from the origin point.
+
+References
+##########
+
+.. [Baron8VSB] Baron, Stanley. "First-Hand:Digital Television: The Digital 
+   Terrestrial Television Broadcasting (DTTB) Standard." IEEE Global History 
+   Network. <http://www.ieeeghn.org/wiki/index.php/First-Hand:Digital_Television:_The_Digital_Terrestrial_Television_Broadcasting_(DTTB)_Standard>.
+
+.. [KoppCOFDM] Kopp, Carlo. "High Definition Television." High Definition 
+   Television. Air Power Australia. <http://www.ausairpower.net/AC-1100.html>.
+
+.. [MatlabGeo] "Geodetic2ecef." Convert Geodetic to Geocentric (ECEF) 
+   Coordinates. The MathWorks, Inc. 
+   <http://www.mathworks.com/help/map/ref/geodetic2ecef.html>.
+
+.. [QualcommAnalog] Stephen Shellhammer, Ahmed Sadek, and Wenyi Zhang. 
+   "Technical Challenges for Cognitive Radio in the TV White Space Spectrum." 
+   Qualcomm Incorporated.
+
diff -Naur ns-3.22/src/spectrum/doc/spectrum-tv-8vsb.png ns-3.23/src/spectrum/doc/spectrum-tv-8vsb.png
--- ns-3.22/src/spectrum/doc/spectrum-tv-8vsb.png	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/doc/spectrum-tv-8vsb.png	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,406 @@
+�PNG
+
+
IHDR
9PRA
sRGB���bKGD�������	pHYs��
�+tIME�+9&�
+X IDATx��y�dU}��>��{���鞙��aPTD�����}!Q
���s�>.<F��kL��A��F�F�D�
��}ff����{��ǹ�֭���Ꞟ���UTϭ��{���s��0�PcBd�K���a��3_��x�t�l��K�����7�u�״��b�{���cPJ�-�޴mk����o.}b��2۾����1)咙�e?k�6ݎ�ֵj�co�oI��K�Z?���襢�����f[����qLEDQ��z���z�N�\�XF�5q/���Pc,�"�0\�b��U����]����[$z�.鸟m{�*�qg�5�>'��������Á�TY�R.)`1�]�u��nv?[ϙ�������-V����\�a)X����t.ٗm:���vDV�*Ek�$,���'��sT��i��քaH�=�yo���ܲ�������p�b1���2��e��3	���Z7J�\L�ۑ��ыz��l�uGr.�̲{ѷ�Bg:�4?f��*�K�J*{�����~�c�����?�>�,T�
+������`_��|�o��������e�o���l��\@G8888888888888888�����������������hB>Մ�þ��W]_tppppppppppp�|A��>�9�\u�U�{���gӦM��w���l���]�%�VB��2��P��[�r�駳g�����s�����u���z�o�������+���?D0���/:���)ʣ[�!�Zc�AJ�������+W���od�ʕl޼�/~��r�-\x�u�Q]O��~ӱg<��s�9��f',(������oa��u������8.
"������#��|��c�a������?�ضm�^z�3�r�k����x��r��~�p���K��Z#��������}�={��W��N8��.�`�&y��$������qV��|W!�
+p���*��z)%J)'k�G��j(��})��pppX4�x�:s��]vQ!���}�3�)�x��Y(���8����aa��N��1�r��JM�~������r�^�g.e7�8K�E+Fw�OZ��.�����lx0�Q2�A�Z���g��R�D�p��"�����{�ݯʝ�Y�ӵ"]��s�w� M$@����XT�OA�BIIN�wX4�������_s������OC�4�d�̴��h"c�m��J�1V�o�G�=����O��*���i&�xӦM|�[�BA�h�
�����[�ߩ^ҺX!1}�B����NIZt· FM��&r�C__�B!;�����I��3�#�1ha��
A,4�1���G���4�}L��H�D��߮_/�������_��|_O?��d1������t�������1h��ν�������r��ք���xm����%����?�����qppXP�H�}�(晀$F4~Ѭ�ktWb;�>}n~�k-S��-[�p�wZ�#W~����?_�N��Gt��,� ���pѱ�Z��o)e�0]�7����&a�|c����X.-@$
+@Zna&7��?�w���H)�쑝��0
+�6�u�o;��M�,ҚXǖd���r�/}�J�FEad�9��aV(���w���o�I���a����EQ�&E����b#c��1��H"-����ܧ;?3�_��u;��8��>��\.EQӮ}+�Њz�>m��a��+_�^�ͳ�߫<��\����N	��z��u"kf���盩}#���Vám�K��cc-
+�8�$[�Ѳ�R$������:9A�����E����NV1=�dROQu�lY����HC��9C�ѡ���M��?�\�ޣ����1<����>l��)��t7O,��]���oW��K6~��H����7"G�wضmJ)
+A�T��+�M���=f��[��{X����*���aA�� L��K��
+��V�Q(�&'D0�yg_)5E�HɁ4Bz>wz+	����i�>r+�
+�ׯ��Y	/�BaZSP��5�Ѝ@���H	�j���y��&s��Z+�0WK�vn
y��^l���6o=/%pR7�^Zy�&�;��vm�Z�Y�R*�ekj��v�Za�q:��nj�8�@��5
+������)Z'��T~�4,���'���'8վ�â�����VB-����E؝J���8�cRyY�H#LFX�Q�����
+��JS&�̀�"�nI�#�cM���q��yH)�c�S��bVFӺL록9�l�;�Yd��`&s��L��	�4>�1SȨ^̧�&>�#Q�J�\�{�����tn�`�Hb~�6)���(�)
q!�hc��{Һ�iM-�(JձLi?�Eg
��к&��y1!���������e���E�Ks+��D�H<��A����ָ�oy��U�hUz�{�*o�wZ���
�0̮K-f�g��uwdo��v�U��]���r��j{�έ��u�N�K���v��7H�F�}g:�v��_Yy�5RM�`iW�m��B��SM�vP5,�-t��R
+��(��š���qΔk��6�s@E��BԎ�i����]�J
+�Ա�����F9��r��ɑ�Bt��97����z�Ƿl���`�Vk�a���DO��|*�i?��};�ֹm.�F7�]��<��r����:m���[�u���u^�.��L$I:_�qd�B���S�X �\�:���>���(%Q�#�:��#(e�I_?A����|��ֺm����Dm������:��>�F���:�P�'��Ǔ�8���)I�ࣤ]ܳ�iޡ�V���Z}�;	�y�?�{��.5�O-3�����������[�3U�ZI�V�+/p���iU��b*܍��Z���v;b����}^q�m[��`�K4Z�)�m�=Jc��1h!�T�
iUڿSR�Z�4���O&�X�2��d@j����ʀ�B���n�KF|!B�5�7��&0������������ʈ�&��ض�u'�R�
)1��{�@
+����
+>:!Q����V24�m�G��6�x'M�"y�(!�d���)�t�VZ	���A��Ι�o+����K����3-1��K)Ela�(O�aE����x�o��T29Od���)�ϥ�
����q���b2���_����A�#�n��(	ú55�
+a�B
��2�j![�>���]�B��)�&�!=p?QX�R�ә�%;�P;�)���*!JI~d#J�&�/{�\w1Z�nL7g�Uj�[I�V+�VR�UY��;��6���
+��ya3��M�FZ�[�t�T2��锑ND�H�ٵ(��ڬ�2�ڦ`��yR�)��y(a�Y�>@ e#���a�fw��?e@��F � �1I
+�9����4[ji���b�_��M���Q’m�]Z>����q��B��Y�2#!��B�$�`jM0:2��|#�;D��@B�t������!����q���l֍v}���ȓ���Z��uo5៭5D'�t�$r��6U����te���}�j��J-ɚ�UP|�Z
��ck�R���M�
��@���y���yg	��� �'���1
+��Lvp�e�FC�Z!6��J	|�������m���ʓ�XS�G�ؾ����L�s�3y�qO�WW���1""B�d��.
`k���k�a��	
+�oc����c�����^FOO�hSe��)���k[˵
+ƭB�t&�툅��n���U�]�V"���vo�ӧ�!��.�D^0ϛ#��\���I�G7����	wڕm�W)���'��HJ$��.ш�&�=�)�2�vn3F4h;�:�-y�j�qC)V��vn��[�d
A��L�$��g�S����d��y�$�0��hkB.��ב�ǍH��B
+�Hk�Nʦd�8�A	�QI,���JI|)�hRT���N�m�ԩ���UYo7&;e�PJ5�a�c�ӧ]}������% ;�E��Lk�ڽ%`�����#�[���:Y�m�<"m�dDzR��@%���`r����E�I)�]��@K�tt���CO�Y����y��\?spp��9g��i0&E�X"
+���|��W��M��$‡�Z
�J�5���_�?��9��ы0�����<���HB=o���t�씌
:�R.��x�e�
��^��l��٘�wz^��`3�d���mt�n�����y^Sp���i^AhU����nge1S{���TA�+���z�=b��
�}8�Jh,��WE�\?��B������O8�C�G�l�����=�6Dq�PȄ��] ���ZmtS�mo��a����Zfœ�U�Z�T!�si�+�"�6���Z-@�dF2휳/v����i���v���Y�lI�|܎v;�{3gN7w;�̵�����$Vn�Ⱥ��܎�h��vÆ

e.��
+#$�
����{�(��bn��
C���������ü��{?�J����988̫���קJ\c�1����.��W�����=��_�|DP�L��B���K���Kx����K.��[o塇��;� �����
�)�f����D��RӐO�
�~3�>��m;!}�A��=�|�(U�۹[Lw�R
+��g����*�I�N;���tJb�v�6;���! (!QBN	�����,Z�v��?�SkC�ɠ��/��a�(����\ڨ�M�HaL�n�)�L��ק�%m�5	�MZ���6��:�n�j������ͽAD�*#�lZ�Z-,~��_R*�q�X�քq�Kߘ��$�9�!�BGL]���1��7���0o�>�﹁�ۯq����0sM���N"��B�T�[���C��>Ŷm[	#��fLL�c�q
�,_1����
D�������
�^�/(�*i������$m�!lD��Xʄi����2��N	o��i��l�����nR��kA=o�ܺۚfm����7��
�0�B�ᴦ���3�[�7��_x������f��sq>�> lZC%����k�\t�F��� �$��i��Y�h�DHi��u3hO�����������})�LJ��.%��5kN䁁�D�&&F���Dha�u�I� B�
�8	4j}a��.4�6��q@�bA���s�!���Kw0_P%��uk�&v�����a&��폸��g��ppp�7��YПz��5�~�����y��^�-��Ī5ch4J�{T�͏o�X,!��ĠM��?��\k@H�ڻ�V�ٻ !�IdJ���T;��@;�րw�	�3E��kv���W>�{Sg�u������`�F��/{6��g6[�4�Q(��V����S�ov��w'Ҧ]t�N}'5�O�\���+i�O���=��$J��q���"9ֈ�`}����!Q2
�(�����X�!a2��5��b@7cg!�����e}2�]��ٌ���R�"h�5#OlL7v�HN����"��i�֪�t�$."��A�rٺ���˭V�()Q�l���)A�DQ�Y*�@�lڴ�C9!W\q�{,��󙜜�uks�	#��;�$�0?�o~�A�{ۼ[6!`��|u��d�K2<J�-c�TJ2�)|%M� �v�`��Oy�P3<<Ҵ����|��
+Ϸ��ڄM
+J���S6W��~�L����u0�����ޖm>�?���zF/گ]���g:���`��D'�)"w��d���G�DA")O��̽S�0��`!撅(�|=��=S!%���9E1n!Tg;S� ��~���B�,ȧ�)��0q�D�q@t�0i�%m�S���)f�~Icؽ{w�z|���[n�#�?���fu�b����yV�M�#ܽ�Y8���p߇^Σ_���pp8���~�I־�Tߠ�LLC$Z�@xD֔P��1��w�ϊ��\y�O0����c�`tt�R��d
���Nq�+"����kZ��U`�'��5˴���-���P�����ܘ7���T���,m��fꘚ�xhvC"�1I@@���>��>�!*ժ
�($�hK%%�(��B���8JŢͤ����	� 8��3���7"��裏f������E]���X�y���޾!�溓V��nq���Y���2q��888�;T�U{�1^��W#����fÆ
�v�i�ڵk>g�������6/z�Rf׮��j�Mf4��a����M7�L�>ζ[��/~��5c$9ƒ[�&a�S*���l4E�6�0>��Ʉ�q^4�_�ݽ�K�׍Y�t�λ"��O�gMWs=�����0���'���z���Q��`�_߹�S�׹v�z��������Z6=%�Y�~3�|Sʯ�o{Lw�>���/s�v���}i�^ӵ��}��=,�h������S�FEM�e�l��#���$�a���m�g�G����/����q�iקf��I���l.�X"7��0�q�y�>�b���q;�w��x�r��0e��>��u�l�߶o�Y���ӈoa�1&B'�mYJMʤ�u��{7
���ls�~�#&''3��Ժ����y NS�J��,J��SN9c�\s
�z謮=��3��K�L��PX7�l��`��X�{���[�����9��7,�`J{�v�V�q���'B.�~�파���׿�e˖�k9�L�p�0G��ԫU�w#�Z�B��[�������W�������'?�w��m��������	LRz�ju|ߛ�EQ��Q��!����g��r�!<��c�f-CC#��D��Dq��6%]�
+I��ߩp(e*�����*aQ*�A�Z%�0$��)�Z��a��5��_P��?��~&K)����X�trv�'5Ѵ�T���R^�f�wk���GG�=R�P�gۚ���ğ�9X�R�j�L�XH�(�3�:DI/�Ɏ��T��R!���8���H��x�b�&�"�8Lڇ,(���BP�լ@��DQH�֝$I�1R)�4b�Ba�Y�k�����%UfV�0�	��r�B�P ֶn��Y�:O)�(�S���I���1
+�SI���O���)��n�*mF��S�֑���DQ�O)bm2�F�FƋz�F�TJ��^:I�F!��5�pKR��Z�AN�4R��0I�{�֓����P��(K�k���(��g�$8��c�W,RЪ�Z��l?5�Z�f3{�J`.g�цX��"is��j6^�d)�2�u)ؾ��;�Z�)�ZP�אR�>�c����d��m�8��}�0
+���B�H��
�)�(B)����N\�$���1��=M��ju����Nj��|/�2Ѷi�52�0Ҿj����EM˝>H��8�u/�9AIێF��Lh�XwtRV��ˑ	阵/`��j��� ��t�N�F_ɧi�sI�V�\
Z]L�zM�Դ�R�6�,jz]�Z��<��j�[���}3oq`�P����v�]&�Ȥ���D�_%a�|O$�m�&��$�gksƟ0������ȣ�!���|O�Ƹ��	��k�p���g?��:������G*t�ch:HN��s�p�MeD��$Z��C�P��FG88�#\vٿ��7��B�w�<��W��S����O���y�q�9�p�9�pꩧr�G�����B�j5��"RJFGG��׿�R�B�H�^���_�������9�x�q<��!��
+�{��8��Z%A������f͚�ҭ�}�(��v�|+V,�^���ן	r�J�B!��G�)G=l߾���a�0�391N�8�Ν;�}�rdө�w۵kW���Obh�zH�Zepp(��l�
+.u5��r�����J%�X눰R�+Q���&�Z%h˖mlڴ��>��V�Cb�{>۷octt�ݻ�d�O�R������$�B
c��N���GV���w=���(ZǙ�?99��i�6IE�������sK)�(��'lTu!�tJ��:��]������y���388�֚(��:�B�X�]�j�����z)%��w3�7@�Z�^�gA�Ňf��q���(�z�Z�����z�BP�(�\�P,���z�N���n{�ի�P�*���!RI�I{$$�%҈��a=DkM�X��
��$qSJ<��)
+h'ʈ�`رs�b��T�z����w2�� IDAT �S�R��D1�Tʔ�}x�G�^KT���b�l�R{��}d�v����"�J%��n֯_o�a i�8B �Tʶoc�(����i� ��l��S~�g�8��S��	� S*S%4Lt��zS�3K�%
+��kuj�G�\fٲe�~��}��DQD�\�X,fX�P�R�0>>���壣�I��8��~6G�~�V�����1�zX�T
+x�GX�vm�T��]~.J�MNN244ă>ȑG�Dy�B�JB�ܱ���A;�0H,� �D�1R$Ĉ�٨�q��1���#|�gbr�B��)�aQ(�2K�8�)��a�(�aS��4k�6&#-��Tl?/��M�0e2'x����BP�����U�5���hM�x^����esRV�X2�\.S(ٜY�V)�	Y��y���/Gh6v�S%��h�V�ٹ�b�Z������T>.��299���%G��&�R�d}6%~�D�R�Z�N��
+�6x���~!t�Fcl�J�!
�J���b``��P餿���[���1��n�	cOzғ�暅K���
�������A��a^0qǍ��Γyڗ~�H�Dz�?|p�����v�&l�lS�>�)OYдI�]��y�+_�hZ��O�g��Ʊ浯9m�H�Ss|c��B��	�}}}��*c��92��j���<���P��!�N����I�Z����j�JEhSG�vĵ��޽��۷��'?9+��75:1ߜ�����^)TkU��������&��^��aw��\p���u.�������B���^�2FF������r��*쩯���ϵ�
+���m۟`��2°nŰJ��S.Op����裩$�9Y�V�1�l�J�B�Za��n����(�lݶ߷;���F�݁�Uؽ{7C�É-�V�����5>t?��>���F���ٓB�1Qd�b�`�B�r����J����m�ZV�]�w��ܵ�����x�c��]`�V�"�%'
+��SLL�S���!aX���G��Ê�b��R���?��ݻ�Tʬ[E�DQ�Ν;�H�t||;v�`d�(qQ��c�Ν�E
+���j�Zchp�j����X5�
+�r��
�gg��BP`|b7�k�a�B���n޼�R�$MLL066�֚J�L�(%y��X�f
����j5�$�F���^�P�V��>Q�k�Nv��Ų�?�O!غm+RH�<�8Zj�ZF�` (�jU�6ԇk�ÐZ�F�TH��I
+�B�f�J�z���v���QH!�T�Va���<?�B0D���}}LLN�uL�f����#<���ֲbb�b�D�<I��͛6����ٹk'a�N�Z�T����gݺu�ر����D9� ���}�~,}e-3J��ZȦM�ٳg���!������C$�)
+�)�j�Z-d``�M��V�100��];`�ƍ|�������%%j�UR�Z����zXO�
ly�(B*E�R��n��q�X I)��kl}b+�V�19Yf��0�Ў��%��������h�@���I���jֲ��r[-#�Jکb	�(�^�180D�Z&
+	A*ٱs{6WתU� ������ov�
'���*�ۇ_t�����1����Y���={��=-��QQ�VAJ�)QS��x�'X�n��������8�B���
;�GF2+�z���aqlɮ�P�|�#��m����?�K_�R*�
+���y�0�0F399���*��*�?�?��r^r����<�O�)�~�@4cbb��˗�9��~K�H�y\��u�rk����mL����t6��-�ppX��&�C<қ��13�Jw~�-[�a��k_��L�]B=݅mM�%��X��vl��R���Eab�Mb���
+Z�L���b&��f��)�]w����$ (Tn�.N�6=V�^M�����f���z�3��5�^fM��δCC���nxj��77ݺu+���g8餓8�32���?�8������cxx!iF!�Z��W귦�#1ql�
�F$����yγ�K�VgxxYb���5##6(�����_5���'QR&&�*SV���vHS�`�na���j��:B
+!l^i���K�}��Hiw�B!1�e��b��61R��� ��}_J	����BH�]&���έ�m��<Wxh!��Ĵ]
1F�V�N��Ne�X��`����C��Y3zsК��B��Y[�:dݺC�1��F�RA
+��E���fR4���L��X�X3}�KL��uY�z-�đ�)��5�F�gڨ�m"Ж|�����k�%�� ��?��E���B%�&^�n�BbzoLl�7��Y�y45����a"S�|ߚ�K����K�vº)i�B�ʕ�h��O���Q
%}� �mw��dv�z�(d��V�Ā������C���+Ql]��[�Ԛv���d�Z�f�ZG��u)�׭EHc�Yd�0�hK�����<>u�PJ�uj�T��[���=�_���Ȓ�A	����S
�v;fE6&.M&�c"�,�v��"N��K�@�����eI�:����4I
+T6�S��u��U$���ú���H|�Fe�c�1����Df)�ߍO�YR��V�2�8o%�O]��W�m]�����]c��=�f��T��Z�^�u�!�u�9�k�,����N{!�|�w8������,����7���Ba���g�v@�
�J��T�
߸���Ǹ
+q�L�s+w��y<��~�H���Id�^@3�.�1�K/�c�>��������o���@�y�t�
�E3%2r*����ӀG)��*Q�_��u�#�R�h��`���L���7�O�l4�X�5QK�pJ�L)%��ַX�r%ox�8���3���C�Y2X�+��^ug(����DI/W&�k(�/��/�����z����W�d�
+�bF:�
+��6�5�mdH�"XŔ,��5����B�����Dv~�8��i�,�ַ?��:�eMDI#����/7=�S�v�¶a�?� �g�$��3����I|��\�o-$��_�R>[��$w� ���}V�d��&��
?{�����}/hD"1��{��2�?s~�R���J�sTf��T�ڴ��=l������?�g��Az}�ll�9��Q�oic�(�i]ʬ���h"���5I���c��ٺᨤm@Ҵ�A�%sTRc]�F0	�b�!2Ha�U�m��O#0\��FSI#���d��t��_̵W����dX�.Dv�0�/i���D�����h�3Ic�������rc���8!��?�]6͕�|־tmh���>��?��M�tI�ց������"�i�kSJΦ��Sw�|;���%חJŤ����|��<5mv��LNT���?�UW���n����Q���/��O~��bi��*�JF��]!
Ћ��dׂ]u�V��rB�C�!}���7���9�;	�����2�e�P�
WaRߨ����^��
+x�{_��g7Gi!�&!>M4S��ƿ;G��㘱�cM�c����zʹ鰄���DQd��''�կ~�W���&!85_M]�tMS�5�6��X�{�;'_-Q�E����ǚ1tW����NY�}E�
:���P-�dma�^�����LNQ����t�̱����L�]�/�h�F����v3ڮ��C��O�2��uձ
D�27ڤ��6�-r��޳����m:����4��j��3����n��)r�Ў5��^���f�r��p��y��\��Zs�[�r^�1�B��	�������x��ŧ��1Rؼ���fN:��9��ۋ=�3���J�x�w��
+c],�
+����X�3�}�S��
������������]?�����ߋ�U�/A������EN�r+�؇���� f�gw��ZK�ES��.[����4H��̄�y'm6e�^D���������կ�d�;T˖-c�֭�nS�r�v�i=f:�ɐ�v.s^!��Y��f���]]�K�Ϸև�a1@-�3dƓ��w��E�t��c����ܩ;�m�O��{ێr�n3�6ޣV��E|�Z�D&�ߺ��<�y\���ۇ�G�}�݄a��G�Z�9`o��YD�E�Sx�1�g��r�;��r�������7ű��s��3�w\�4�;&����x6���y�F��V媧�G��>0�!�e�'zs�$��~9�����;1`��R'�M�T�6�c�mj���\����/�(�ys�81N#�ۈ��w?���=/`]s�5,_��a���8h���Bq�x�or��hC��*�3�.�@�t���6ʐny�Ceiь��c��;.�vZ���a�3����ZC���c��h��oN3��l���3ɹk��ܘ������H�q��I��nGQX��~ŏ��G�������p>��{�gVr�#�cA�\pݳO���֬w;����{���/����$
�l��W�<|�T��X��~�W���r�o����WnE���	г�%��q6�0crc`.B���{����j������t�mH��g�{���|���x�������N=�Tn����߭���4ϣ��hwN��j��߻��٨r��k-s����1)�U��z�%2y/�w{}w��$=Wd
+oޕ�s�y�fj7�����E۹WacL-��"@��,ǚM�o�?�!/�˳ud�����
0�")}��Gr��n��a~ =�s����#8���?�c���Q�b�㚟q۹/C���dg�����m�:��0�nt�{���UkГ{-I�`1���yID�$�vV��&$�M(�x�	���w�aÆ,:x�o�1��˗�v��y2�=Rz)����KI!;�N�CS���F�ӥڬ�)�B#��\�V�o_lX���ϓR��ԏ���&�
oxg�}6/�˛���W��=��}�ຓ�\r}G�*�a^P�� {n���g��_X!����A�`%����/@�r�+P}�p|�~�,�S�܊\�,}����O��Mf=_X��|�����{�<�ϤV�e9��\(�4�t�Tb���������gs+6i�1�)���d����T�7�9x�XpY��i,���LW�իW�2
+�LƘl�?>��d�{A
+w�N�'gb-r@wM�`����;�X�m���>nW��=�{��!<�;����w�����D�e�L�������e|�(�WǍ�7��*��B��P#� C��zNX+��?�R��B�
+r��866���آX�B ���B`��&7׵�>��|תx�ӫ.�������nH��:�m��DQ�I'���ݻ���wC������w%�h�N
�������C�y''^㔄��Ƃ�_����}��0�xr7���):�C����τ;��r\�
p�{�C���
�v���v����	~��ɿ܎74�����L8`�!�#FFF%]';���jO�ӹ�:�����t�vpppX�0H#�X��4�}~>k�b6�]�DQD__�>ՁZ]��,�n
)I288��������3�dŊ��\T�]w����9��%�Ƌ 5|4�����p�@���˿�=}��`�5:��v��c����o���S�s$ߒk�t�����l�C*�
+���
+:�]��R<��#�y��*�K#
?�2)$:e��r��Rf
�*B~�9�@�EQ�UC7.�<#�c}�Q=��y���
J��k����曹ꪫ(�J��u�cŊ�MO���2�G=�������Op��9Np�_���v��[&﹥Ӭ���zg�������wzm�z��:Vpʯ��
�:`�!P���b7��"<

S,�%f�� �1�����s;��BP�T�ZS,$�����CO�7��I�m��I����ҹ15�7f~6BS��t��tNZ�vA
;�k�e �5�R�I�ժ
+E���
+���6̒���"��ؘJ	H22`r�LNͧ�M�*�$�&�N
{E�/J��_�2��Y�v��\�U6��;Y���r�üM��0<���������
+&�}Y\�j���H��I+x���`�@Ӝ�|o��s
����!EH��H�
+jM���5��
+�<��O���.o~�;��
+�?��O�T*�u�Yn�;88�w-�n�`{3���v>�������d#Bd��w�u'��~�zk!є)
<��۶?N�Z!J�hV��q���$bF��@��MBhX�_cPrj��0d׮],[�l�8�,K��뮻��>��;�袋8��������o�_�b�y䑼��/�^��5"l>���]�ʗ���ө��#Yvs�v�Og�ℚ�pB`�U���v;�]��O��
�g��Y,	�?]s�>���/��%QM㭗0�044��XS�J�Xwpp��1���ꞽ.�LkB�V+U
+�U�6�3�ȇIh��G�Ǧ�J�0#L��D�ٹ�;�Sɓ��X�V���ͻ�u�Zt9o�1��׿�{����O��O��Y]�G��׿�3�8�3�8��O>�ge��_�����ſ,qٖ}�m��J�ox�k���K.��R�D�P�N<1k̴���g�c�ΝY�>��OGJ��y�J%��%>���#���+�dϞ=�x}!���.�c�"�dÆ
|�s�#Jv�����oo�7n��{ߔ��)��!�t����oOY���RhΨw���J)�/_�
�!8��?����q����xM�������L�upppph��Y|���&�"��
h'&'�3�l/t�z�z��7(�	Z|)	���x����r�����z�����q���Iom�*��� �����Z_�����w���>��|����ӟ�4����/�JYJ���1���{V6	�c��2?a��v�~���ǩ\�oy�Z�-[�P.���j,���.�:�e?�W��AFFF���K��+2�c�ʕT*&���������6�l���]��W�����5��Ӟ�#�<�QG�]��R��o��]r)��ַ8����Ϯ�_��	6��.J߈S:���R\�TA�g�#
�[�������M:�뮻�͛7���~�n�����SFU�Uv�ؑ��q�|<��<���j���'wu���Ozғ�Ѝ���s����t~'e�ӹJ)� @)E���n�L3��M0�����/)RZ�	�<O&��&!*�Ͽ����!��FIT!�� A��Q��"{���Z�mF�t�i��t]Ku���Hd��:������'�x"���gM,�
��Z�A6*�����>|���~��������ٵ�|χy����k^�R.���\}��A�ԑ��*۷o��s�塇�3��,/��?��7����v��w����?�#_|1���I:%�(9鹧P7�~�{8���㋟�k73���K2I8K�}P�� p��;K��q�?p�wp��r��}��?��|�+l۶�;6�rE����ח�uRʞ�������t�R���q�1���r�Y̹�9�t���9�ί���e�z"�uc%�w�B�<�5A�)��B����5k�d��&'Ʊ��8�Q.AŘ(�q
�8���5�6��
+�ޡ!K��u��ك����Ro��C�hL�cZLk��i�(c�J%֭[�8;;��k!6pΡ1��3��'��w���T��Kn�<����Uwr�������8��袋زe'�|2�z�SO=����O~�}����w�����ٵi+_���㪫�������
N<�Čڰak��E_�G�<���=��|�+_^R�t��R��L-
*{���� ��G
+����2�(�GP~~=ܞX�i/��}�]����!�
�6�w0.;�裹��[9���
x��8�#8���ضmۢ�j3���T��R��)
+�:OK))��T�UN:�$|���9i9�����g'sM�t]I�������+�Q�)���ș�4�gS��J�\���V 0(!��G�G�ջ
�R�4ȟ
b���eD�:����c@
+6>��ІH�Y��v�����B
+LrL��.;�N	|����P����/<�̏7����3xd���w��{�	��oˮ_N�{QS�3��&��]�իW����+V088HP�
+FGG	���5+���5��)�[��V�:�,�p�YY'�����%��	���y��7�կ|+���ᥭ��A��v�
tq�o�~�
+�[:� IDATS씅�J0��c�n���x�Z2>�����;����wj<��֭n��".��rN=��Y]�
+�n\;888̏��<��
Ч������C�R�ڹ��/��W����U-K��H�(�`�M�)aז(�	�-)nt�P(�������e˖Yw��Lʿ�
����	RH��!t�,x�2���h���9��"/��`���O1t�	��g�g����s��M�������m�ณX���f;��W��c�
��o|#���Tv?�Y\v�e�w�}cX�l`��q�ET>���ϟ�'��o����
+/}�˸���x��^�h��<&hbw���]۹���!m�M�؊{��#���/xŒ�}#P�ջZ3�/��
??\���v�
����
:
+�[6��,\��4��;֠ǧ??�'?�����M7��K^���s
�R?��oV�����V
+����Ѯ]v�-[�\{�(�χ�?]�T��A�:��.i���o�2DZu��g�Akh}�L�W*�<H��t�ZX`��	FG��1��M� �X,R��2¼s��Й�Cf�ȑ�]ȴf��z�'¥�^:���!������'!ʥd3�z�Xb���CXw�X��N��<�h���Z�U����펵;����7���\q�>S���ݯ���CY�/?tq��.@΁�������+�w�x����,
�E����I��*f�?�1���
+�X�#ES��7~����y衇8���ٳg�=��ֵm>ׂTĸ�+��˜~�K�M��S�������C�n�ʹ���:p������k_�ڮR�:8888��H?�oM�ת����}�����k�S鮺�d
x���g>��d�Vd��T��� S`�
#�:��� #/	Z�0�i_hDg�
����MZ�i��Y�BX���\����ijKb
��C��ͲS^�$�v�]�c�>3]��իW�+.��Yc����v]��)�������v7o�j�����
��o}�}��9��X�y�&�?��#ƙ
/�F]���;`���~8CCC]�_Z�y��|>Bj�P���^�[i��b��Yg�EEMV�P��9묳��)"�����Cw��|��ޔ��o��f[�C94[�{�emQq�e��_��_p�'c#��i�'�uL43�,����I��&��7��oء^Դ$�~p���{��
+>��}�G�}��� B��o|�mW^�8�<v]M�kJ����u��\��p¿޽��3!lV��T��1���nFa˿_̪���*eq��i����鉳FFT*9�[��51?ׇaH�4s�tg�����aq�������W�X����T{�ZEA�0ٱcǂ�^g��|�c�
��w�O�,y�aޱo ����9+_�6�����2Z~�^L�����#�q�[^�hCT�"Ȗ�2X��.}�l����>�g|�wK�kYa����腫���;��#���S�w��z1�w�3������
+,A�"BH��=d���<�J�B�\�ѷ?�!���6x�3�wpppX�d@/P����S�� @�8Kh׊��s~d<�T7�!���<��?���weP�p��^���cݹ�Y�g��l����"�b��W����`	f��}��pƱ��[�|z��@#&���!��~ͳx�g��U/���E
+]�n=����Z!o7�Za'�w�ݜ�E:�������vx�;�e�-�����þ[?f��6��[�h�	
��L�6H�8栃���|`����� �(�뢙"��p
��7�}��B���"<��(tĬ�����"�	1��?xr۠u�����]D�����}�q�'��o]�d��+��U����[�?�8��t�H,Jig
���q�g�V�^�61F���"P�q���h�����\��r�B����1��s�ג9���XJ"����}�v�l�̪U��OO�;v�Zk�0��Ͽ���
��D�Ϳ�?:�g�a:v������zm����8%p^��W��`�-�͍o|���01
�%�����_~O��7X����
+Yl�4���A/;��߁
+
A$��4R���<�����.O7�w����2�w�#��0~����y6_�P�8��q̪U�x��GY�jռ�)�"j���`�.
��ʙ�`%\{��:nsE�B�b��/��
+�w��
|���Ok	P��8�0�P}pǻ���ӎ���c�2���$>FO�e��߭B����<���/�Bx�b�[ ��_�vmb�?��3�p�qDZk�.7^�8v�ލ���^����09����AP�u�|�g۶m�[���X�Eg�v D�U�P\a�o��#%3���nz�)=(�(I
�a��/4�a��%����.r�Ģ�����8t���Q�k�:�vN ��C!%,{5�	!��¿
4aX�j�߲e�6m:`d�aM�VF�r
��8&�"��>����;��8��kDT9�������l1,:@��W_�!����|�����RY3m'k,p��0~����Woh"
���g��F:Q�����޷0y��N�X4
+i?.`Wky�oc����^�R��֬�]9�(���oJ��
֙�����v�]$)����J���aH�k��e�a���ui!����8�}�{ٸq#�~����O:�k��#ʝ�(8ar_(���ষ>?L�l���-� ��@q�>\ಅ&
��ӏaˏ�锊�0B���|��졵�����8�T�X,f3!�"�/_Ξ={��e����Á)���Tu[�H�y˗/��,��͏,w�Wf��B�A����{�Rr�'�e˖Y]��o~���ϙo�H�x��:K�����b��_s����
�W��/�wP>�&~Ю�-�!��}ov����{�qAf�B���U������e,(������kע�5��9��i�&֯_ߔ������a�!#�X����y�{c�{���K�<�8��Z�|�0�p�=��aÆy�3�_�<7�p|�}ӛ�D���[��::^�[��`�*Ɠ��í����_���.�Ղ��k�����g	������7W��z�Z���yh���
+�V�Q�T�)g~���(�B�)k�������C������~`��c&�c�nݚ)�^�z��pV��bl�/��c�=�5k�p�W���0�?m3���0T���mZ�>���_p�+���S����K���Du��������|�Y<���?�e�'�:�ѽ�&���Z)3����ml4��g›U���6n��w�ř��Uff�rIH"*��B69�&�@6c0ƀ1������3��8�sۇ#8��&�`"� P����js���U�?�{vWqW��v��ӌvw������}�z����I�&�ww̳i```�7��e��f��|ϋ*�@2�̳�,��3kD�h��8q"�-�W2lKC����v�A��lX���ʾ�k���Z�@��s+��8�����!�;�tH�����s���_�y�v_!��J=��C��p�B.���v�8;�� ��O�)�.����,�q�8�O���q�ژ��H$hhh����G(�۲
+aK��*���f���c.z���m�XD2�nQ8��8+,�JX���h^�v~�7(��/��u��2t�P�O��]���1����z���v�Z|��7�=���?��$�� J��\�C�˶m����ñm�p�0�?��۶�o	��H);����_�r^�.f�u�Z������:� h+O����
+��A�2dM�����!�?���
l�

+�|'���z�ߍ�Q@i(��^�T�����+����p饗r�]wQ\\���{[��T*E.��@���/��P;3���
=���>���⿗����Ԕ/�k�ڵk�h
+��f�N��r Ui�	P� �
+����>���-
+w�t`�!��� X�o_��A�AS����H���:������U��|�����~��m���O����6�f��׿�u��P7�r�\��'Ƽ֚�c�vp�
v������O
�	SUU��`b�&�K�3w�Őm1A�B�}k=�ʢ� }91
��xf�r�I^=�SL��l�0�tL"��ܳ`����5{����%|�]�@�]�m����CJ�G�׊�v�S;�Æ
�P
+�;���<�=�pRJr�\�(�[^��q0000�_kԎ��)S��p�¼xmO8�UUU=���=��^=(�r
mh�{��(%��}�H�e�;���Y4�����с��P��v��6a��u-?�={aΜ9�1����3x��~oT�ƒ�8ye��ܝ�4551q�Dl�Fk���*��;�������r��7000��PJ���PJ�y�NubF��O+�	�K�q�
��6k�U�\�=��B@k}>3
�Fp���
N9��3�ѣi���M������Ǭ[���_�ʷ���y����
�X �;�'ޕ�,�իWo��;��ŋ�n�:\�5�8�>��������N)��aYA�X���<\�ͯgF� ���"J��M
+�0�Q�TCr���kMg� �j]t�!v`,���G���9��o�W[�)�qP`w�+v����<�/���w"���>cƌ!��v8�����A�CEE��t�$���u9r$@�i6���fr�\�����@�0L�=��	`���6���
+V��
���K���@�ֶ)4>E[�b��¡��V���[����
B������9����1�sů�y���9l��q��40000蛈5h,��N��?”5�e�e�[<�#�L�ˤl�(��M�=�0���؁O�v7o~y�qBz]����xl�v���>��+����ÌOO�	��;����r�B���K�g���g'�p,S?������5�8����]�S����￿����w۶�M�Ύ����R���s�
���������������Y
P���p�CȞꫮ����)}&�`k/�p��/
+��7&@�4�w6��������`字GΑ��n�;u�f�ELB)ͦ�y�w��������a���C�����bJKK�}���:���7F����}�����t_���.����u��6��j�N�����T*t�{h�?��H�R;�5
�.���43ސ��Q����0
4$��r�=/�teú��[�a�ݺ����Ъ���H)x��G��_����ôi�ٰa#��|S�[�r9n��6,X�{���������
U7n������\���"�&�@�4���!��W��,�ӊ��l���j��y�P�8N���RJ��XA�5�c�}o��V���	�`;i	�4�;���?�[��O�ʐ	`��u������e�Ri�qV� @��Yy�7w{4�L�B��u��uR����w)�z�iƎ�W/��'�x�.����6�?�.�c�8���}���
|��j&O>��n�>�q#
%`6ݱ�WZ����2��S(;��!�<�T��0ڎd;ヾ��k��x
��3���mG뱓/9�/�L�SO=�ɓ's�E�VGH'�'yy&�Q��P8C[��������r[�D�=a�X��q���K޺�H��}�?T���2�{��񿄰Ͱa�9��S��L�4�5kV�b���Q�<H��\������O?��O�%E��`Y���(�*�I�q��²,jjj�f���u6�t�R���{�Ƴ����A��yy'{g�{�F�`���444 ��#�p|
�ub�2_MMMx���~��|���iؾ���Q
ޫ
[�P�
\��_����R}���k�h��}�.��C:�����r���]�
�X`U��Ś^'��j	�����WG��?�����WH�@),	����o]ǡ�NiW% ��k�w+�.PA��,�`u��hx]������5wVI��}.�������e```�w1j�(���r9�;�C{_�����)S�,N��I)�<�u��ʽ���JHSS3g��RG�w�}�5*\r�}I`�ƨa
�!�XB���S���dI/���cMº?����:�8'��w�ѻ��6�¡C��f͚�
�L���>Z�~��k4)�Er���L�4�\Ώr����H%STTT�'� �e�#~&� ���y���P�-+�B�<�<_}�
���)e���c(���������w��~;---d2�����*�x͚5�3�3fp�����|��ʼ\p
�W�������i}q鶢����F��
�:�m�
�H�����|V���77��n�ՍG/)�	�i>^�����:1p�@F�CkkK�z���TWW�L&9���p���h-�:.K�QpOk�7T��oy��[:����>�:�֋��[�?�}�Dh���HL�N�&|l�¶���R\�p�(N��e�:�
````��}&ѡt�6��f7�(H�y���#z(���#���&܂�C�J
�w�}Y�j�l���:���:N?��.�#��v�������h���
�
/x�KH7AQy�Ե�NT�;!$d��W��O��qؽ�4�ձt_�Th�b�ᎽV6/�]@]�&|���o��?���ͯ*`Y�wߟ�5k&�ʼn�8�%J�{A���}��d^h��}<��T�SZB��$S�����t���,��!�\.��� O�o�j�~�j����ZR�R��T^0���:�=q�������b0000�6�6��a09�Ud�~��t_`|��l;�ȋ�n�����{"���Ge�ܹ\w�uf��A0L�=�������`���Mo�Ȋ/��f�=�]�s��4�E{�9�jjj8���9��Yl޼�ٳ��/�;�@���X�t)�'O�;ܱ�����4�\��	��L&�a����=�#�ˑN��f�A@6���<Y�hq)E�����x_L��}�L&��y������F�%�2h��|p"�^2�v�(n��yd22��q�
�0��%No���q��
=!t��R�P�8�]B��7�,� w�A3L�=�`XN��E�	`�s
�u����'1�Ws̎e�lw��{C�%��0��Y|��#ҭ�N�N2� ���o������6� PHi�y���ܜ��;�$�N�y󦼚�=�܃m�$�� �?���x�	�!���.AP[[�رcY�r��;���ma�Z���q饗1a�>��c���hhh ��RVVFkk+%%%d�Y���J&M���@�})A�e˖QU58O�옯)�9,�bɒ%����;�4ϓ���A��ŋq����#���n{`���9���9�8蠃z��mmmű�]g��! ]߷���	��H+d�Z�+$��-x�e7|�o�?�tʇ��s��=���f���)++c��
p�Q��,������
+,�²�Ԏ'L�@&����:j?O�w�0ױ���n��6�e�uzfΜ�̙3�{}�����n�uRQn�¶-JJJ�={vWZڡ͎㠔�&���n淿�#F�Ek�w-���b*++�sd```��������:;ﷶ��J�z����6t�\���R�BCf߮/
"&���2
t?��]H��{�����^]�yS��SF^�~w��nhG|�{�������k�������G!=���n"�/����;��d�u��B�X�EG�
+)�[�9l��ﴷ�V�AS^^���5$���ծ�J����M����Ѓ(��"T����ʤ������|I(��Df```�W����k�9蠃�B�ݍ�����
�uQ�0�~Сr?���khm���D���T�C�����O���+M`'saM6��cC�^������g��ò��
+�q�FfΜɔ)Shll,P���x?��c|A�����[/"z���Q������V������v���~o<��qƎ˒%K��BkՎ�$ڽn}�D"����ö�
�IJ|��P}�3�ѱ� IDATk��ɓY�pa�\ӈ�#ذa=�/�k����鼶t6��?z�H������L������	��o
��?�{��2A�,to7���ᱠ
Z����#P0����5���g:T�g�B=�_wel�Ԅ���Oq`¶�n���mη��g�����+t�H�����A�F��<�K
���V*++{�,X������A�Xh}>������3�кf<��;Ua�{��s��rxw���Ѳ!Qb�X��X��Ծ� �~p���ܖS���r�lEx|�J(չCj8����;c|�ȑ�����'�PTT�W��6��xYtg&�m�,�(���.|G�}�Ks�2n�X*T2}�t�~�i��4�D��"���r����8p�	��qH)�d2���t˗/�BX������k�c���ض�(�:�/<b[h|I���XV�M0L�=�������p�L`O8o
�?.h&�y�U6~v˱���+xꩧ8���(++�K�����3;���d���n�ר���
B�]�#Dt]�!�9O�����MH%�\[��$*��w�;A���	��q����K�;���}������Y��?�<\�Fh���	F����	
���yr�f��"��Jv`(���e�bخ��{��ή_�scB}׭YՍ���q��q�y�q�G�ދN��3�C�J�jlHI:�F
+!dt��y�V���k4��r�Aєn���
mI|����wh|1t����}�D�uinn�����8�>�xm��ߢ�B\�`t��wAX���������i@�Sdj��/L��ev�68e�ʉ�3c�m����#0����O
+r�1�?T��ʜ��7[Ң���A���7X_���ׯ�ÏV�+�s:Z���y�f�4���?� L�����������"JJJ:����
��o/�N���jo��{Cxhn��ߋ��h{��Fp���v߷O9I���W����&@��nL
0��ucC��,�4RZ]�S��危�5P
�����`�6�T
+���
)7AX�1
[Y�d����
�eY��}cƌ�P�egζ��qhmm����
{Y��'����PJ��L������x��f��L�!Y
+�k���q���KpR&Phإ��	1��0
�a���@F�~D��]2rb�� B
�eq�u�1~�x��˩�� a[�����_���z�������A^�v��i����*?ݍs�9�����׏��ї�&�GO4;PE<27���~:ࣞ����8g��~��ǘ�����ڍ<?^ L�O�4�od
4�������NM�C��_���˗������LKGN=h</�f�10000��4\kⵧ��%�K�~����m)e��9�
+�P�[o��7��M�q2�^x!�_=?��z�[qm�#/��E��	�c�5Fm��}�`ēhQ8I3�
+
�^9~pt�/ V��àk�d����F��.GL�B��<�~�m�z�m��C�����d���W���̞=;�n����s�����o�[=tȥ���
y������z��Pѧ_&O���_���TWW3c�~�����v�A[��6?P){�����1�:,�f��A/��1
�o;Ʊ&�1
L����V��
!����ug����S�"R�b|O#��BJ��]�T %JZ,��9ϑ��-�Y���!��z�g����濹��th�i��:�p,]��g�}-�[�;��#�gίآ�q�������hii����SLs!����<�L��4B(��m����.��S@�u�6l��=��Ð!C��˰��r�  �J
�BoW0g�.��B�ָUYF��.�B�c+~)�)�`��~g��5���m�Qc�����a�N��qVTVCP�g��{�H0��F4�/-@�"��{�S�PR��.M4�L��>����I@�a�(������^������g��*N9ᔭ��:�O`m5�H���ʏ8�D�mmmw�~�5б�U�J� ���A��p�B,�bƌy-���Pᮼ�el�
+�/�T��=��2����
+r�������A���k�ڵ/--e����5�K�<�����c��
+�C�������	�l��P�b{�و\��%�� �0g�����e�$c�f(�A�7����c��;_{ ��St��N�
�%��:��X��8ٜ���,[�����4���u���c]o�L��OSS�-�=��W����"��l�f�700(<l�&�L����BB���eYd�9jjj6lX^�?\GT���p���&*++�}?�!ޓأ[@�eQRRBQQ�=��2f����os��������/�B�m)f���J�%E�=@چ��'�?��&���*d[)J�����?�
+��&@�Q�
+?�-G�!0B]rރ �?���K��m��'��4k>��c�>���:�G
+��C��R*$�A�*���:@��|Z[��,/���c��]��;F1uT)�?�R���q_r��:�s��Y�lw��+����1.����b``�	�S���yM��N"�8��Sy�G�}E��V�Ҵ�AͲ����j�UY�Çg������������0Qt����+�|�x�ȶ�g��Oa�%��������Q@�I�G^css9�����$�d�=�]�R*��'����mh��d~�o	�"4_��VZ�-h�(**"@��H["5��
Q� �y�PJD�N>BX��� ��u�-�k”��\��xT&�!�J���`l��}���]cKC7v��٥q��\��������H$p]7?�t�
� ��$�-#;�{�
�yVB�l��)�.����49op�|8�L��(t�ǯ���96}o�CcM8�y3�О�v�4Z�TI�Zc����WVVv���Ѻ��~���e[a��� %�&@�� P��
+T�9W
+�@
�H%B&�
+BZ�Rj�h�m�h�;䣔B!-����
!����iB��d�isX5Z+��P�CkD��X�վ��e����:�A�w̅�"f�F��E�^C`�����ߟD"ѡԭ	���R�4
��:a��cFDa'�P �h��
zv��-M�<-QP�ٞkn��C'�����硔"���i�:��2�m��RJ8��-��Bb�߽�R�$�(�H�FDZiim��Ȧ�n�m�?;�;�9��2
+`[.�J�	��lt
N�������ok���?o�'��[t'Ɗ��W�T*�b�޹�A!��e�acɸ��y�;�����>���
��(��600�{�Aۚ߷��!�S”�
M�Q@YG~c|t�p�馛�,˲
+f���v`͂ŏ��\��K��(	RX/\����Zۂ=1���ӊ�^�
4���C
��hd2fϞ�C=ěo�ٛ͠N��&�ΔF�؎��e"cJ�s�:fB�6�MHl��6��b�(�� �җ�����/0b�Θ�y�<�(��0�_��3V}��!C�8�'�d�2�������>��o���W>o��:/��iB���=A��Vh�[x⩧8���8�̓8d�d9t�>Y��A�;�i���da���|���,9/ @��B�A����C+PJ���G��wJE%XUtDu����=�BV����GG9�a������=\�|��̧����rټ��+��c�����S8|�~�˟1gΓX���)
*ȁ���Z��]�jc~Q����f}�֬FK����+��P���N@�QZ�Y�/�^��Sk�XQ��?��6lZ��:�|�X��x��<��d*�o��c[��/���#��3��h쉾�sa  Yfl�r��Fg[�;��c���&�v��)���y�…�\��+��"/z����	E��Aǽ��
^.G&�
+(��Ƕ�.}K�؏���&Y�q3����Б��F�,���2f�9����n�@}}-߻������qۏ�#O>G10u��F�u�F
~�*ֵ�����_΂�O!�I�J�P*w��@J@	^]�*w���~7�r;��y��Ǹ���0ނ�����H�
���2d= $��G�c�
B�솰�@kA�tۺ��҇Ȱ��x^�	�/�$Ƕ����B��
�-R�T@�r���hlK���Ji2E�+�%�e�C�
+w����5�cQװ��y��{�}�EM�z�<�4��NY����R�: ���l�%�P7A	��ٜ�v$Z)���'����!�m�(Q�sy���s�I�BA�ϖ�30�wH$y��������6vQ2�F
+!b�t��we��m����j
+`����/]A��^��*��?C:;��:��	���^�ki3�
�{�
�3wj�O2
���m`av��x=�������h�kُ�3�k;%,����7oӦM㩧��;b#���hW�]�	t�`�5N��W��UΩ=�!��w��6�5U8�̀�(J��C������hGb	�-RZ)Pѹ-iE�`(���1�g@e%	�!aY�;����Ȩ���R��Oh@\K�r�47��D9�(plK�x^��K;���%�t۶�-K
+,K"�:�ю��8X�M]}=�Q�Bb[�5�!�R �D
+I2���.R8��d��a�KkJJ��}�]���3�q����aC�r���ߊ�a���t��6�Hڑ�BH��L�o�I�l&K��&�J"��
+ǶH��Q��W��,;
+rHS����#�>�9'{k�і��Ai�qm�ř%^�ڧO}�
�����Zw�slͼE/q��1r���e^v�p��������\(Z�,�O1
L�^���1��
|fAs�j�FQ�(���;�R��D�@�f���4�q����\s�5�{�<����Kqq1�w^o�����٢����:�f��iջ8�����*�e�:���!������O?/�a[!%3�k/:���?Y~�p\���4
�4��?ӏ��/���/�lu����o~�[jj6��Ϟ��1#yz�STo^�1G�����9�,F9�)!P*�7
+l��J�/2��=&M9��.����J|�{<奥��/�3�"��lذ��O:��z��~�;x�f�oPT��[~ġ���a�G��[iij��[n��y35���7zw��1h� l�������Y�|��~�L�Ī�>����%'�t2W]y%Ʉ�W/�
+�.}�dQ�
����SO!$<��C��]w��������:R8N�|�s�����T����z(4���7���Z�[(���<�M?��\.ǧ�=�_��g���c�c��r	�M�6PZZ��l� ����Yg��_<�'�<�/�K6m���'���=�}�Yn��F�ޗ���������L����;�=:\#�ם�b��}l�f��	���;|z�1�M���\}���p�
TUUu���Y+�o���2���W��KC˔�Q�t���
���H
+����[L�`�d�Vһx5-�~��o4����>�������4@h�Q��������wc�{_��c�=�����̞=�3�8��}�z��?-�ʗ��nE���	P]w��w{A�XL�;�VTTDyy9�����x7%U�R�;�e�ڿtm4���Q�>���Zt��$�:ۑdU�e�x�\��/�P���n�!w�}7��v6l�+��;�����`E�����G�|�??�7�^�
2���~�$��$���[�QƎ��R�7�~>�֯�����\�ҪR�[�c�C�o�?o���L�Jxg�I�q'A֫c�
#��_�9S�%߸���"���R_��9�T�8|2K�]��_��g��)��ܹ���ܧ�K?Z�m?�O&LǐA%��~�x���Q[_���֬YB��b��GsshEµq,�.bܸC(.	�rW_�
�o4g��y^��<����d�J�0��Vq�Q���/��\��o�c����X��ڍk*CS�zT�\�ճy����+��>�Z��U������N:�����a])�����g��ő��=��ҥKill�;��H
0��.X�I[��[9��3R�h����N��
w�
�pA����aJ�A�cv	�>�`���UJ��7��F��.�ӅԿ�m����NcѢE(�������-
�������
+�m�h�ihl��7^c�ĉ��[�o�~�-���;-���,,+�}�Lq	�D2��ފ�/��+�W�l�w��4��kx���3R50�C��Ҍ�|��46�2b�`������S���1l�0��X���p<v$n(�H�Pk�O>��&L�ɧ���߼��#G3}���g�`��JR�D�-�՛��H,�b��x��'(�Ɓ�es}���
�^��Yï~�s���,Z�7o.k׭�p�o���C&��_��{~�[�`�6��Y?��A�8��c���DS]#��kY�Λv�$.���|��ϱ��I�)6m��+^�N?�G����N�����?��s�����/~�+�KJp�@i,K!�}�0�V�fu���R�������D
+[^��_��|�33X��=�>�8n��OY���O?����L�8���
+
���>��{s?��/��g��yi��72l�p��*������=�ua``��mO��R:���e�e���R�T�����U�.
�Լ��#4�N����GH��0L��:h}�	�n�Ƞ��	N�Ff݇}�M���c�s��z�L�2�q�г:������w7n|0�q��H$l</K"�bY�L+˖����˵��?�L>���C>�~�u�v��F��������*����l6��h�
�m�Ig�o�9���j�8t
+/<1����ϔ�
Di�+4GL�Di��ls�����{�J(>u��q���+��v��BA�%�*�O��{�c�'5�s���ׯ]‡˖s�Y3	PlX����Z��/Ç
b����s
�����b$A Y��#\)X�b��u߾����r֙�PYQ����8p���0�r `��C��:	�#x�ɧX�d	O=�˗-c���~�I�:��n��G{,��}�y\ʻ+W�(M�/g�	Y�����B0cƧ��<���yp���������Nmm=I�%��€����zr9���ա��V��m�H+�Bp�o~�o��U��Ņo�d�
+ZX��:�<��__Ͱa��4�p��z���&��%��sO?��M?�eo/�/�5�7P[���ӏ�'����nh����l[�5i��o���_�4�\��
+!�7�\.W�?�a�B ik���"�<�a�5؉�h�Ä��8���:Ci�jXݍ�x�s�8��)�t�^��(]I�v��
+!�zu�m���.#��1g�6o�Ģw��������
����d2���/��4��hnl!2x𶖿]�eYTWW>J���mL�]ۋ�s'��H:�[�s��6.�T5d_��%�x�,����V�`ժ����Ӛ���5�5�466���8���ȥ[y����s�̲��)**�0��.Q;Ƕxu����?��g�l3�x��p�?��=�M��E,^�d��h�%2��X���k�&�)�,cՇ�S^����%�Z4�obݚ�������dr�ּ��s��3��~����,�L�S�;�SO:��CG�>��?�
*����c��1<��l^x�I
��
C<t ���-��y��N9�
6RT\����M$I,�µ�H$SP^^ơ��f�f��%��7m�;7���}FR�r�=�ǝ�������&�

+@CC��Ŵ��Q��J2���i����"R�"PS���^z�$���D�"�iĒ�!C�������Ԗ�]��.]�eY�?~��K/���n��3�<�.�kjlļ����+��z�"u����C4��/�B��b���DL���D1��qf���;��Ƶ{}[�|~���޷{jϷ������[��cƌ�æp�ԩ��o���:rP���O֑J�ȶ6��
+�� IDAT:�aCQT�@DZ�q���tp�J��+"+�_olll�t��a���Nu���gڔ���o��I{���Jʱ!���,��C���ªZ(M���͵���$�Ee�?�����Sy��z�ͼ��k\���x��PQIei9�tTjH���������<
��Y���Y�d	>�'|?��R�-�46�SYQ��ŋY��}����Dz$7l�9�L�����s<���<��8N��EE���|��lڸ����L�0�\6MIq�q�t�L�8��^|��#F�_��{~}^.ͪWr�g�f�;j_�KKh�o����s�x>�F����/�+hl�g����>�V}HyY	��|3�<�'�x*�-�'?�)���Z����P4K
+�-��7���夳��4���O��՜5s&���իWs�ر<��Clڰ�ի>��)C]mC� Ӛ#��Eyyuu�drl�b����PΪ�����������HqQ)�&Nf����3?���o`�"�N�y^�T��k�0d�2���[�vo2���ƶ��NN!��^�����믿N6�墋.ⳟ�,�^{�.EC�=Hؚ��X�'�g��X!�v��Z����}�g!�R�M��'�Nܗ��^ޫ�j�@7Z����W��v�</�s�=�e9��9��xg�"4���x�M���z��w3c�T~x����򋀊i�s�dBRz�C :,�XQQ`)Ú�B�e�vf?��MB�(��,o����������ޘk/��6BX�!�d��I�!�����8��cQn��V�D�s�r
�]u5�>�p�G2h�@~��;Y��}�{~��q`96 q\����ͷ���?���s��yg3�3ӹ��[���|�+_a�[oq��9��S�a��I�6��������u'���#~vׯ\1�!C�RW�¥�]�u��n��N�;�T4�}G�G}c��s�7������S��ࢯ]�_�����8䐩�v�M���1i��|�{�s��?��9O����wf��Lf��_��r�~	;ɰ!���?䌙����\�ŗ\�֒���A��Ο��#����hMg�F��~���\z	_��Ks�F���Ws��3q�d���:�:��_z	^}���g�ʵ�dž��}�ʊP����pl�%��

4��|q��r����wq����_�	ϳ�狯0b�>�0��Db�<�e``����D*�U�i��t�Ʊ�ZY4�7G�Nu�N�G���5������h9�'"�Bx�
���*~������İaø�;����R9��}���)�{���?ȩG��$�>J�O:��B&@������HP
d�� �6�o�Ϸ����y�܁��F�M
+Eq7�-`o�8p �����X6

�H)��^��,[����b�ɨѣx���ra�����敝��V���-
+;���Wn�L&��$��b���txH)�0a"S�NX�E.PT�����+V��cO
�9O?h�^�ѣF��aE�A�UW_ŷ����g�С<��?!T�>���)'�SO9
�iG(�(�������Z4a	�+��`S�'��$/>�E�-|_c[��W�����L����@�Τy�����G�0n�x�{��6�7��b���>�_���/>٬lj'�ĉ'��M7�N:�D*Y���_��`����Y��&Ldٲ�TDzkk3��"4F�-�2�����f�"@k�g�}�����ү���!�$I�[�R�jժ�
�yY-Z�eYx�GdX��}��ò,���s9��Y�n����o,���TF���-)����A*<t���׌�q\;l
+�/����g�>���K"��
�4a��u��̚5�y���|r�?�0_�җ�	y衇����P��=ak漾�O6�m�&���
2M�	`Ѓ�� ��p���W2
�*&P%�t��m����uy�9F���8�Z������a#��4_��崦��<o>���ye{�^h��%��k�
+�"��F�I]G���֚TQ*,9h���F�R*��89����!QJc�٬Gqq1--��c���a	��yh�ͤ��o�t�r^��Y�b�2�}/2�T?���[��~�Ci���R�@yy҄�|� �mٔ��
+
+�Vض��+JKK���LeE9(�\�!�ɠt��
H���G{���v*���D�Ek�~���}Z	l�%<� G�K�,ZCQQJTTT���s��GDcE���Қ �	T��dra*�._yQ@@h�T*��J)�R�r9,�"�H �Ķm\�E� �>�TD�
w��3r��
'��!%��v�R��Ç�r��n����>���|��ϧ,Z����b�M�@&��WVVr���s�EQ__ߥs~�_���J�n��]N����
Z2�坲�������)�f�	`ЃFޘy~}���^(�����m���e˖��O�P9p��ͤE������qν�<V���N�����_�+*�~ks��ϙ�Q����

+���
+�u��td@�g��7�[�an�_�m#���w���|�KJ�;	�;)RJ�����0(��y9F���΋	��-r���V�!��Ee�RZh�9�Щ\yŷ��m��A�_h��)T`!�
:���-$�t�
x�[:H,?�����@aK�±%�X��8H��f��,�d2�v�Ͷm��-bG9�n�V���c�Dk�-ĔV)m��;�Œ!�!lW.�aYB����]�!-A ���.	7�a��m��g� ᦈ"�{ߧ���i �X8N!��g��+ l������8���+y<�VDkdwx�
f̘�/���S&M�DKKK~���\.GSS�]v�e1u��.�3662�1bFA��ښg^��#�Ű���̠�A� Y�4̆�A��s���8�O/P�c���P�t���^����^^^���K�ꪫihl`��!���?d�~����7�8'{4��~�ʒ26��2x�@�}v?�0Z�hW8�v�S�DJ�
+w�]��_���-J�4k
��MeT��g�"�c~�X��e�#�
Ad*��
+B��7q�QG��С�	�
ڂ�86�Ɓ�+F����e�9��%����R2�̇�l˅|9\��$
A�
+���s����Ne��Cd)--�����t"��B��o~���$�E�l
+����A�86�ע�`D>̣������2����Q���_x݉D�]_Y��-sk�hw�-��8��6bX�5�R�[�Bg��xo���]*����ރD>�?t��2G��s*�bժU�r=Zk�m�����'2q�D��׿n��]�2~�0}I1p�>��f�cÂ�pʴ1%?29��}�$(2��,5�=+��uǾW�SVY�9v��X4.������Gss#���
+��>�]������%_���ӑ���7�o��-�O���kV���/`�KX��2��ZZ[�p�44�Q�*e�ڏq]��O>���~�z6�n������Rr�G"R��,�7�z��ں�A�r�-inn�w�3pP������uI&�A�ҥK�,�AU��9�՛�)++˷:|���q)D,�\K�����k8��3�,�S㯣Ǻ��K�����xggg���d��]�EG�
+�@IqX�U+�V �R<b1*�(�8������88�w��o��s)-�"�|��&T���mo��v0�tf���o?�-���pn�1�EV����Vl�f���\}�ջm��y��nVW:'O�"��8H^�9����ؚ�^]��C�f����i3(���A��m1L��c�
0�SU���<�ؽ�m��s��o��:ܑ�m?|*�=�l�~f
IkK�'f?�Z2MTUV��_ޝ?G6�w����{l�������S�����H$�����l\���f6n�@mm-�ƍ�������F�
+h|_cY�#��dظq=�5�IgC�<���3i������ˤR)fL;�����u���j�ř��Ƙ��c(��2e
+p ���lwW �����
+l�ڱ+�6�g�Z�Ҳ�Q��6�}g�v�C�~G� ۸�N��ě�"*�����A̚d``��yH��H�MJ&��R)F�ͦM�<h�"��(k����>�.#�����},)�k�^Ȧ?�ˆ�c
�~@R,� ��L�ֆp��s�C����\(k��ͽ�[
~#�NviE�e�~��y�`��uO�	����s�
?����/v��04d"�m+�fg��}>���?GeU�'M&D<S
���tD�G��T�hg�y^���\�%��կr�)�GSM��;�T�"�2�t��	�E�ܲ�;�^�����-�k��~|-z�@E��mːݹq��[�]w:La```гk��L�άka���3s�ओND i��������.�۶�y
�>d߻��$ڼ	�$��!�.%f�����'�VP9�L*��PA$؋���ܫ�B�S/N�����jʭ��覣w2��~���%#O~��ے�w�����&����}iI,�(����_������<N��Z��[U���l��������,���-.?M������>�����ݨ1j�%y��Qp�
+�"Ⱦ��R���Q]=3L�Lw3�3�˧>�LWWWW�:��s��ܬ�
���4"�(����s�j�?�Ӑ+��,��Z�1n��C��'��EƿLa�k;��}�ѷn����2�B�P��9S�X/�E���:�8���k8�������G�oߎm�9+V�u���Y���\-���ҿSۍ�HG	��d$���;�cA�j�������ӧ`�TuV����@�lҿ'J��hӨk{�֕+��b;��aFb����BK���wo������M
�z�m{-�dF
+MM�t�kW�dG�����W(�i�"�зo�Ĝ�kr�w����;QU�tѠ���>69��Y��U*C����l���h�zx�w��'�B�!���٧��{'���e�v��.L�ݭ�W#�2�^�v�~�2��&��@<n���y6Q�?U��֎���7N
P(
+���yͶm��n�;g$��d�?�|Ɏ*�j���ѹ�E]U4���,?`���I.a��0���o�SS��zr�wh`[��Q(��#%�{����b�P�m-��ys�ܹsٲeRJ�=�X�����ŋ�]er/�ёN�v|4���KFҰ�6m�H<o�hp����\���h�"{�D(�B�P(�*_|�K�,I:�3�-�B�u4Mc۶���׻�j8��ʾܴiuuuض�3Gt�Z���w�c�C0�J���v��l(?S=��܏
��cm����=�j�KX���Y���M��N���O

���7~o�Bd!o��&�<������os�)��q�Ff͚�
DžH��'rvm��ql4�Vb����$_C��LM�ҮQP__���Ó�+
+��k�ŐRb�f�Mf2_�u�MV�%2k�������B4M�Ꜳ�����(e�u9c�K��s�ٚ&Y��rJ�0��<,[�d+roxG� �d���E�`W���'o'�}#ox�S���<nq�A������������(5�6�hT������g̘�?����M�61u�T���n;.|>�P^�[-Yd�r�����9j����3i�f��"eu疨��'&#
+�B�5	�����8;�M���c�ʕ�?�@�&1MM�|�ݻw2Ͷ��E].��L�	඼)wc�ۢ�B�����}G��Z�^:P<�2�:-�*m�������:����y��69Y�NL�Rl�>��n~Iq0ZZ[�b�������I�T6���r�Yg�?���w�իW��5jT�#R�e���g���{_Ϟ=B�O�>x��>�?c�&�dȐ!���'W�
+�B�5�m�x<�U��g��o�D����KHD�e�r�f���i�c"�\�X�O���$ߧ��Ⱦ�E9m�i�/��w">�H�ßv)'�*"�g(�!@��S[�?5Շ#��������ᛈ���}n���vQ�5�y�I�����hx/�`7{�QG�QG�T܂w0m�4�=�X�̙�C=�mljiZ����mǘe�����׿/7�p~_R:��
8��E��ϲm��˗�	�
�P(]'QG&��/nj����=��'���c�믿������2,�ʉ��9���@P�rV�/2B?�C[�<x�r�l,?�^ş7��ȡ9�k�J��\���]�t��=��.�M�w�נ��!�ND+�X��	H*v̡��t}��z�i�����ޭ��F`�SЛ�f/w�E]����7�Li�v'|>~�?Y�hgY�����GZ��!�L ��K��s�2�H)v�Fi�t]���%�	*
+���b�6~��4���21���
����/�d��阦�adgV_~�������:tJ��
+R&
+���D&������f���F�3."�5�5!Y�aU�q丩ت�b7�*��"���檦â��IMt�F�J�V�擥��K�C7���OM������B�8B��������_�[�_	H)��X�����m���:��z��"��n$�6!��BC�t|>��F(J�TE
+���b��'#��O}>B~�0e�.���dq�l^
+���~��
PUUť�^ʎ;�ѣO<�g�}6�H����s�W�}��e�u�PhT��U�|��'�0�]��Z9�%+�f��1�=�3ʐ�cD	�� %�k�7�+���AҼ�Ǝ��X���fƪ|z�{���B��������wp���1"A���U`�|���N=�C��p�]?�i����(�%裏4e/�ܪˆaPQQ�(�(��b�]��[Ƌ*�u�����
+*
+�b��3ޅɖ{��|oN�����~��<����>��"0�9���a�6�a4�7�� �2g�F���NUU&L����%'�|rF�:l�����{8R�y�2�0�$Rgm�y$��I���TՎ���B�*����j�H��~/���y	�����m��&���(�1@���x~cW֫]�^P9����.��`+�E}���o��q�{��➻��:�n�^�����dYVR�q˲��b	c=;���UUU<��~����G��,'��<�x<��B������&��2�����B���?ψ#�h#�y�[��,+�T�=�
PYYɛo�I�=�۷/��sW]u���
�D2:�3�a�w����ql�?=�W�S����_b����9���WNa��;�o�l,Ka�\*��O	�1ر�V�4��	'!��y���>�}�������n&����h��_I=먔K額Ia��v!LJ��@��F

���l�J�7"%l��
+�\����snh�}_$��>�U�\i�㭬$�����%ۦ���H4���	��[5��I��(**BJ��8H)U;@�B�袌3&9�dn���I�>}9r�kP���}}}=~��0�G
+@0dܸqlذ���~�K/�![�laݺu0 �c�r�)<��3�Z�����/���{`��(Pg�g�q�\��4���gQUw�M�R+芜+�P_	��H��p���R,Q8x�e
�L:6y��n�x�&�Z�3."DA��+���Ϙ��O�CLJ���Sr
������A��ʪs)�#\ǿ�ߟ�?��=��#��pw��2�6��)%~�?Q�O&C�3u(����…9������L��!祔�@ �\qq'gʗB�P(rO �E=���lii)o���]v9�mg��v�i�����������nw�9�0�馛�?>555|��DŽB!�8�.��¬n@Q�|���.>�~l+��
�j�g��Р|��Zy�
��VF�"�h��PQ��pLh��X�s�4�L-K�f�Iߓ~�n�S�{"�䣜��h]<����y�:�I�����������g��+�qWa[��q������ˈ��j����f��L��h]�q!�x���j�p�5�]Gi�OnH%���O8��)�Շ�b7Z�0t�B�ҍz��
+xy��j��P(�݃۶��_Ӵ��)A��� �Cuu5W]u�6m�g�2�t�ݍ�� IDATfJqq1={�LΗ]�
�1|�p�y�&F���^���l.������0��j���G��Q�C��>��
4Ɋu���=���V��
+Ɔ�G�!���#
� �������J����{]s+���o��Mx�6&��1lE����o�����p�D�=Xb�K�ؗA�̎%h�W�̘�����6"
,��ö���eɕ��mO��^� ۩0�D�lI�Z5*�g�4�u�8d`��2�U��XԕQ��p�Y={RJ/^LAA
cƌQ7L�P(�0��`�&�`0Y S
@w^[�~='�t
+/��"�;!���弼<������#t�"����~�tr�_{_��=��� A�/>�aP�&j�z�ŀ\^
t
�UN㫕w�����*[�
��-;0@Z�}�on�v$�6��a�y��&��]`�t>��p|��3�iN����б	�J�/�?Ƙ�+�hy�U �M4v����U;v˘�01i�^�R��P9����eQWW�&4I�X�$ݒ�����,6l����&�:Bf|Wt]����7}��Q�B���\���π
2֏ܨF�Ig�6پ};�F�z�N�;v$��" �΄����s8k�M��@i��}#G��$�՟���X7��qL���zp�CJ�_|�
+�K:0@4tH�	`G[ȷ��	/���n��({X+�S�1տ�H��˯gJ�����Bi���/�;�`\A�þ���$˫nft�%�2�F$@�����{�3�۱��ߖ�hh��8��%r/]#�{�3Q�l�J�X��i�l۶
p�2�M��Ä�a�P�P(�8������dtZ6:�ײO��&Qn�x]�euN�i&��\Ԣ1��
��6��j0c�Y���"�e]��L�iGvHnmK��kP�c_����Cg�'W�;c��A^��K�P�c��tW����zR�_��
e3�l���)������8.�̸լݩ�N�m|f=Ⱦ����H��x�1%���	�`�Ep,��m=��*/+�窉�����L���0	ǂ���0i�;���A�$��������W��B�Ptq���aFV-���Ͷm���0?�V�J���Y-�I)��|����.4Fw��RJ��zg������J/��*�-�T�o����P!$߬���#g7�Q��9vh:ئ��=td!v�DA4�B�
p��O��vPr����t�EL/����t�T��/��9ظ<���O�8���)�xU�6S�o����@�K��q
n�����b��^���7�6lB"��N4�u�����8蠃���B�P(��X,�<{/͝�4�c{�֭�"
+2ד�c�J+�L�V�n��:o�5���+1I?�^ ���j�������4��S�b�e2��=ڟ2]�	�i�q'%�zN1������G�W���
+| re[��N� �>��˪Oz&2J�㫊�ӊl�y�90r)C-�1����d�$�����-��� �tvI���0l��(..N�>�?�iG�u����MS(�n����l>­g#�$����߲5�
� �b�6�h4'N�n��ֻ�}��ңG!�dVz���C�r�Y��V�tX��\>��%�N܄Z:P2�
�Vt���3�\'�m�#@�0����>�	�
+�m��^�������[F��o B�E���5|e�G����&���Vv�sRJl�h�M�d�i�n-�%�/e������b�\�����`�FF��{F�A$i�#(
+�������e�y����0i�$�����\�2�sڶm[�rՊV� ����7��e�͠2�@����%9W����h�+�!/����_��脴%��*����V�ʧ����m
����s�n/�����*�6[�)Z��򋂼'tW\[��g�X�� ��W&���8B9v�B��\�mm��H۶�m�u�ֱnݺD��n:N5�,��Zv�7>��S���q�x<�9)1۱�JQB
+��D,(
+�������E������к�cYyyy��a,ˢ���H$��e�Y?z��&��
��J3@IY
w��w�,���S�Ftȹ��8>�P��)�j�"��Co�|�����8����5߶��捿`��ٴ�B�l:���	4�G��J7`W}`Bh�z
%0�@���LJ�߶�H��H�Z���`N"
6��]�63�4�΢K������â�]6�ZZ��B�}�YƎKyy9˖-��od��լ^����D��{��pk�%�bz���_a���D#qÇ�'���i:d0'z
+t]g���J)
+Eǫ�oۙG�	��+ ��%%%��L�)%O=�}��M��®4��@���p�(
+|n��e�7 �޵.�H�����!y�m�IG	ԂE�Н[*q���-�6W��o7ܓr_]���)	?���73d4�iD�e
aG�()�G����xJ��U�E�8
�%!���&.CGK�����,��f�qy�v�������
�?ǖ��8�Ʀ�����Ae;��k
+	P�&�4�?I������ͮmcN?�t��(��P^^�ҥK�9s&/��b7�]^k=�x<�#V\~��͛7c�q
+���b1�H�`2\B��Y�4�n�JQQ�i�,�R�P(�GW�,��Em�+�a$+�{sƨQ�ؼy3��[�ٳ,�9����ܨ9PP^��ί}�e��f����&&�`�z��"��r̡�0-���G�C�W����j�54�d�<���	�5����)��CoY��}�zǭ��,�N)��:����~&�y�'vۆ�
+(������&)%�W~?r+Ѻ��Mul`��;�7."�ArKw�YW{>e��Z��.�e
����f3R���,��%t|	��ȝ�����x�3fp����i.&L��_������2�n���Ƥ�pUUU�86���qdƊΟ��'�>�l
+J�����f�ԩ~�8�)"�9RJ�9��~2TE(
+E�$��y���GJ��ŋ?~<���l߾��={�1�A9)��t1G��M�����T�u1�s���
������Gu��|F}+���4��p�z
ڋ��>M�>K@��cR�Z6��FK�{�cǯK>�>�a�g�BJъ�R'K^�M@"�����Re�w6yV�3��^�8�$����a5��;�߸�Ì!`G|���Ѥ�&�����aM���ao��A`Ni�\;8���.ӧOg���I���7ޠ�����3jԨn&�d�5R0$/ϟXuqeY:c�!�@ضm�V]n�ޟ��E�Y��i&C/�c*
+��k2f̘�ܒ��Ӹ~@MM
�P�X,F0L8�3׈����B)�
� GN���o9��Ml�X����H��9ȸ;Ǒ�.y��5�ǡ��vc$��[vƲc�D��݉��o��6�{���ԓ�)���9�A�r.l��m�>۱�
���Y{�+�:�Eh"Je���z�`����I�.�Z4�\�ןW�὿}��?~�bN9'ճ�o�G�_�a���|_�¾�	?��-ӎ�Вu��Pph��&8��#)**�N�駟fٲe�����n,z�R,��0�H�i�e�=K�.eڴi��a��aB!7�ò-4�@�0�0���
�PE
+���s��L
����p��O?��>��3g2p�����裏f޼y2˲r���)��6\�Tq)zF�q�xo7D� ��ޑ�2E`�Uz�����Z Hckj�W0���mz�K��9lYV�c��Pc�%f��W�6��BĨ�L�>2���"q����l�`�)c�X>¡�"
+�K	�S-W�Ⱥ��ƕ8�hjͽ��	�w�3��n��d�[e���~�-ǡ�i�^˖e&VH4�M�������K�&M�v�d����B� �kz�5I��]ד�
+
+�B��^�R&x��Aש�F8��C��bY��wϱ��T4�H�p$o�{9k��l[_����8и���閕lC�����8d��j��XZ`ե�A�z}�8�H��ɥ)����R�IO�	���}PҁOk������ah�]XNaN�bw}d"��{�D�*r̥�����ZHME�<��|c?�X���XQ5�A�).Y�kG�α�&g����_�>�f������h��To���(�(S�WBl�F�44M������|l��0��M/��}8������eYD�фs"w�
+�B�{�ld��2Y?�k�����aӦM��wV���<,�r�3���s�He�$zT�]w5�ů���8�}�&���xA4>��/��:E`���anͱC��Т�g�'�k7��Q���
H�J@G�!���w�w�Wѵ8���*� ;�`�}�*%��Й9�7S��Q]Q�R�i�T��|l�ʁƜ�04X_�S�fJ�s9�b8D��
��{zr�����i�8���[���j�#�q��:�z��������������|��q++�����;�ࠃ�c�ɸ/�B�P(�***�RRZZ��@J�X�"P[[�8��)��‚�8������iZr�T�Sqq$���d�-������:
[7q�q�n�x��5L�0��=�"Qɾ��� S��rb0��9#u�L��1��~j�F~gT���u��;q�kj/bh�=XNA�F�&�쨚MA��@��)%O}��?�)�{i	F�bl�[�	�����Ž�����E�\��k��&�N�,��u�q�)3��z��k:��HDx�C��A;�_Ӵd������X�w_D"
+]���9

D߾}���
+�B�5Y�|9�@���t]�H�K	��C���(��`�l޼��������4�dT�j���	E�/k�b����������_q�q?VnϜHl/.��:U3s�:+(Uk��l�F�7ֺ��{��%�4rHx��RF;���ڵ�q;���葎t�Hj��,������B�:���R]s��Pm(:�,Ka��?�sG�����[��:��S�pnF/	MR;
+rhH;�yTc=#�_A($�H!t�#�Z�^������
+���mK7�_�ٺu+}��GJ�&��kضM]]�����V(
+ŞE0L���ۻE��Գ@ @0L�Qn!��s�fuN^�[���� mcV�|������G���4�9��K�!�9T�A�%�}���‘�'�SƼ�V]S�މˆ+�I�o��2��k���s
8����Q�n8�锰��Rp?���FM��mҳ�b,K�tv'��fs�qO��k_�K1��g���h�Sۯ����^��8���d1���s�.i��2�w���6˲ٲeC�u�i;��<���"L�D�|!�׷�z�J�i2��)��@�IǁL��B�P(����l��<g�����u˲:th"w?�x<���D9�Q�H�5�Gh�r^�Ts|���@^|/	�`��q��	����k��Q8��/	
ڻ�"-�!�`e�8�^���Gt�gIj�1,����E��i���4���������;�u��'�M���yc�f�7[Z��Y����N���k��z�ݮ5$���Ɔ�h!��zƊQcY���{U���„B>2����y��mۄB�D�
�9�3�4
Ǒn�@]k�0ع�����{qq1>�/㹦�����j�R(��G,K��l�����q�~?�ǏO��������l6@ �4M������*�-�/	�k`f=�t�,���ucRAȥѨk�W��>i@v=���ȧ%fE��@|+L�V2�k���%�{�E�[k�c�M��	0�p�����/��5��D����-[{1+7�/�ޱ�L�>N�Ǘ^��{c�HP$6Q6:����q��W����(� ���o�+o�YvG#ф�%����1�RJ�q!Hn�
+��h�d4<;�s�X�v-�@ �si�{�9K�P(:/�P���P�6�՛/��eYh��aL�<9�΄!C�4�*���^
��F5
���Bĩ�#��7����3'����K���3��ͯ����"����E���� '��ô�kl����]��Z}�c\�oV�͗����H��1";
n{�<�;���lb�p��A�;.�~?˝�SE��vڶw������L�W�S��;�C}}=�efl({+.�֭��S�N�X��R�s�0��˗cYV�N���6�B�Pt>��x�9.�.�|f�v2RN���cڴi�a	e)%�_}ҩ����?9��c�&BA�UA�Ϭ����	஘8���&@t��Xr�e�̸�@�<����`�@'��;`�9�E$@�/ш�;R�����L����/i1��i��_��N�x���7yx��>�Yh�
+��v�Y�'��Q%V;nv��2�DZm;#�VW�q��iYX�M,Kv���q���]�&q,��Rk��3�m�a۶���
 ���K�N�J�O7�2�;�W]ٶ�D-+���
+aMMM��{:��S�
+�R(�N���K��go��u/Rζ4Mg˖-ض�l�JG����j�P�lI)�������������l��79_%Ј����-B��[9�RRv���zb#F�P
�v��8='���]խZ]�sqps�|���U��Ŋ�RFH�T7��9
�|�BF8���c�}
FΣ���bRC��vۺj����o��{)�	��D���)��Oii��f�w<p�1���^�}0L*HB@uu5�\{
�ׯG��}R�۶����|����9�B�~�Қ�ҽ&�
�P(����"��x<��/)E��� �G�t4M���۶ظqCƲ�sJ��r��|����|����(@�`Q�6g��Ϲ����_��u���=Pz�H
��ϣo�qg�"��-���[�	 �X�+~�t��
+��ȳ�>�5c��b$�������	�+�vۺb@��ՌS����0��i�aZ�:�!
�e��|�$�pWK�8�ׯ�q���2S��0��U���]w�
J#�AdvM
+�Bѩ:t(�{�N9ǥ�{r�q,\�e���@�ںZj��8��a�����׻�lU
+@�W�<�����YE+��8��
r�Pk�F������>])�?��k;>�~{�hVT݄.�;�C���3$�/�P@ݟ=�	p����~�kEr�ľ~����J-��e�a��N�n8��������8N�"����҄��	7g�͡tWSt���}]����X��h���[VV�P��0~���t�������[�h����B�P(�&}���W�^�(�L�G!D�H/--M�躎@P\T�q�_������`FVE�`7Q�#����<@��g��|b݊�c�C��x![*&bZ��&����s�
����:�sB���s�&Qe��h"�����?�!���tx
+E�8
���b*��NQ�T$�-���Ȟf�"q�ek���|�+��BE��eѢE�������v:c?UA;O�����p�H4ܜ|]s����q�j���c�R��
�!�z�Ļ���^x�
+
+��#A��>�
��"���|ٹ�w�T
+�W��G�9?��R���eVK�+��e���d���n�w�UV�h�ZUU_|�e�c���!�e�l�P�vH7�?�3/��Q*x�
*��[s.�]�ޗ��
R�ۺ�X��������;�s4V�\�."�Ī�?�U�ჯ�����ǦtÛx^��f��O����ľ}��6�Z*���]�j*R�/���~�-���L�<��7������k:�B�xu#���	�_H���hފ��蚎m[�	�|hp@$��A�����ya���~;GO;ڭ)%��0�q�

+@��G"Q�i��Ө���8���Fhɟ�|��iY�R(�;�t��̾���K���cٲ-�������:���0EE�M�V
���4_p��nY9��
��N��9L�o%�2r�C���/)�[��C�P9�{�XtN��,�/���1�c�W��+��C�qWX}�L��}#�����˶��k5��zE�Q�y�f^���j���j�~?uuu��dҤI�f�߻#'��2���F��W����E���P��>��PC�(�v;�m���0a}��a�ڵ��ٓ����K/��ѣG�ӟ��{ｷS]�ƹ�b��f���
�����,y�c��ol<<�-[6S�x� IDAT���OPTT�7qt
]8�·S:��
+�^�Bp�=�p�'��^{�K�e��P(�G�nl�7.�P�Cmm-�eeep{s��Hv[�
+l�B�]�y0IJ�&sLZ:JM
�z�R�=)%7�v.���e����,���}'���	�;�
+��g@���?>^Ō	ðU��.0���M����3vt
vĎ�o�9�+���s�S�5���W�P��;��篥�棏>��On�<l�0x��f��}���w�%_�`
��_8묳��2/�����_M���=R��#�O��9̸�
���f�)|���Z��O�>M~��g�5kg�}6�V�bܸq̟?������
+����DZu]Ƕ��F>��S�W$����#F@�\%�7o&�RR�OMM-�<_��+��c�����ա�2&�N>75��yUd��_M(b̘1G}5���!�c�&~�DZ�|�d�;�B&9�Q�F5I�k���R��(�eeY�P9v+�
>���Y��f>��R��20���k8D�� �9=wG��JM��?�D�>ݟS��͟Ò���
+>J��x�1%W�����t
������.lf����'�H~~~���9�6nܘ��3y�d���*/^̄	��,���R>���H�Ԕ8,�~���}�_�Q[��
9������?n\�~�駟�駟�_��W�����ɓY�t)�Ǐ��'�����3�<����2��ض���C��#�f����(����jΛ7��;]3 Q�BJ(,(�4M�����D}��㸥������PPP�S�K�P���Ī(E��A�i�J#�&o�5��V��~�۶BPTT�i����9NKjJ
�Os���0#�^�����@GDRrۛ�q��G�,��������[��s����}���1�@�����3n�[����kXU3��d�eY��ߟ��޻ɶ�>�����m�M�h4��͛Y�re���n�yJG�J)��[�����c�[ux�߳�x�ؖea>��Ϩ��n��s�޵�2e
+x ���ض����9묳(,,dΜ9�n�����]ױ,������܉�E!|0�>�8��X�k�oڴ�`0��B�e�i���ݽh�u����sV}Y�Pd/Wv~�U�
EF�����R��+#ezU�ܱ斺�l'�fY6�n`�&��Zl'��@�`YYY�Vκ�(Ww	(��������o/×��h|b_ǡ�]�e�~��|�5�ڟP`����Ǣ�s�հ�X6���
l&b�۬!Q[[˗K��X�?��\pA���X nذ!�1���l��]y��O��u�]ǒ%K;vl�i6����}�@���e��b�u
ӌ�H��NW�@��ݛ޽{7�~�Gw깪������V�t�2���0X�r%S�LI�+�w���
+�!�2Q������m���X�����J�(��'�:R�)��xM�ܖ{Rz�gD�eܽj�>�/�֘��ۏ?��1���8�YQ����b1�H��h�,ׁH)��_p�iXdV�=@1��7Q+��س)�.�@U�،"
�H���v,�Y/�vܐ��+|clܴ�M������[��aÆ&������]
+���n��5k���?���(RJθr*��z>U������;lS��	^~��n/����7�p�!�$�/!555
4��ݖ�JL6�B��a�Pb�B����W�Ƕ3�|�9�-�b���M�F�²,׹��kjj����
С�̽�?��G8y����ȵa�F��ɗĭ�����	�Չ���;	e�vl���()*e��8��c9��c9�#�|�:�3}��dzi�&�-[�s��;���c�����nA�	4*YF�m��F=x�$�X�4���k���B{�Ѩ[��*����F
�Ֆ���E^^���*@�P(�8�`��Ö�h��7!����իWR��X�,Y⶞u�?�믿������	�
�E�Rr�;r��S1�l��O��먕kwK$��SU{@�χ����࿞���ʽ���Gw�g��k�aɒ%<��c�*�_M����o*[pL��Ҿ�5���*�
+�0���˸�@4e˖-�B���B$�H8	7ض�oڸqcC>�B�P(��.,0t���P��:��h.j8Ư�k>��c6l\��^���ϕ>�9l��8p��8���̾�H��M����ϰ�bu#;�1�����]��u��5ٞ{�9zO������9D s��e���:���SO����~��[ɲ�Oܗ��I��L��V�	���ǧ
+4)pWG��}O~�3.b�����������#�$�	$����g�r��4�daQ��V(���eYD"����#����~jkk�4�ɜ�؃~��%��F3ҫv�G����`��_����鉞���O!��9����"m��� hH^�pG�0E�OP�Q��MKձ������#�4{mذav�a��R__�TA���~��gy���	��̞=;�~�]eL��/���,��?B	)�:~�lp>��v�4��q���IʤL�x�b���i�c���ϼyeڴ�������̨�W�ɲ,����u�gX�P(�#55�n�W��χ/DZך6SWWG~~~�9C��_��>}�t�j�
�c�AJɷ�O\8�V}����"0�ey�>��S'��I��l1'Y���b� o۶���)�`֬Y<��3h�F$!
+�8�]wo��VF����ׯ�����]�h4J("p��77����~:�>�l�0 ��7�Ա\W�3����R�2����\�b ���2��1���4ɟL]ד9�^��6B�t�Rz�����Ӑ�����bN��{�J
P(�.���8[:�B�4�ƊMZ�����~^x�~��7�����Ļ���?:)�	��#G"�DQ[M�
����7�`ŧ�y��7���4�k��Y��L5�%�Seڍx���:`E��* K֮]�E]��7��yyyq��
+QI)�ꪫxꩧx����ׯ�w\��~���t��>�{$*i�&�`�ITE�|�[n����G���+���Bp܅���O	��s�V��Φ�vH�6;Y��)�@��z�A�q[������9s&�i��z�A߾}?~|�Xd��{v���sP(
+���,�^"\C���5�ۚ��9��y(U��X����=�&�RoU�����/���:F��lu�]��Oܗ��y���cVڑɛ��L2~ߪ
����K���"N<2]�t����5������<������?o��5y��W�
�;，��x8\�~;t%26���Ç�W^�N`����j�{�Ypc쿹��ϥ�ey�p�'���&πF�%ߨ����J�H��B�iZ�M�m�	��}������rJKK��D��[�`Y�mcFNW_
+�B�	���-��3�=���&t
+�]
�Y�X�bE�`�����F�>h�Dog��o�R��.0�g��"�b$%�>�|d��?�����h׺'���ϛ7�W_}��k={��w�����8���Je�j�1BJ������P��B֓����ﾛ�N;��{�[Es�n��\������s�VFj��[;8	`���.χ�m(趜m�}#G�L�߸ϔL*aUUU�T�2��ҕ�d������L
+�B����~&z��]ד�b�R�$���b�z�-~|�iwĈ�|>b�X�s�r����oo�g�܆/�ۡa�Y��N�"�����<����Ib��u�i�g��:'�x"���Z����c�1w�܌�֔��ƐIp�:�s (8{#gĈ<��s̘1�7�|�[�(s�n��_Z|�G>�;s�}��I#P���F�Hi��'���},��`���غu+eeeH��8��]E�ٳgs���3q�DձB�P(�0k֬�0������m�0�,+ٝ���g�&EE����%���q7o�L<'deS(�j0U�m���/t=(����o��~�i���rhh
����Ni�;�*x�S^�o���{ｷ�uY�r%Ç���d������w4(����E(����h+��3-����g?��ӟ�Uw�w���&"c)#
4||n��(��i�
�M��}������a��;��Z�T
+����k�F^^=z�����͙�t4Md\OB��a�(--�2�\�P(�)//���ѯ_��
+�6���������:�������۞�4MKv�B�"�݉	ǎ���p��7 ��
>V�/3X?>������
W����h�;��;��{�a֬Y��~�i���Ϧ<�СCY�z�|;1l*\�
n�~%!�v�1�?��OL��V��.�
���ù�w�}έg�-E�7aV8!(zR�`2N�V�qH��{�D�D��\�g���O?���eY躻����	�ICJ'�����r��xr~�T!T(
+Ş��P�d}����8������5��	\p���N����c��nf0�߫'��x�>�!�	g��u�
�m0L���cCc��߰t�o8���:�c�!�;w.�}�Y��l�ƶ�f�9sf����>GJ��ի���k����lr�����<���NR¶��w�gZJ�SO=Ņ^ȣ�>ڭZN9���k����R�3
����(��
*���F�lٲ��C�"�IJlt]k�`�������8N�3����ի���ijf#q�E��iZ"%A��B��˜��������4M���2��
�G�ҤN��#�KIP�PQ:�1���fN~=y3��!6�a�1��'���u
ph��o��?�CX�hQ�מ�y�㎔VK�3���o�QU}Ny-a��~��� )`�����m���<��v�a|���J�������[ȍ��=�|�S�&�P9�0����ˣW����Y�#oE�k��D(((`ժU�5B"���x���5L�"�2��߼y��*�DV�B�PtM�~r�߶m�~f��a$��<�ȝl���6n؜���J���k��@�,+�&�"����wX)��9P�OO��?�
�-|N>���X95l%��-a�O��֭[�l��4M^y�z��ծ�/������ڸ?�}�����3!��Ew1�o��v��(BV�\��it�A\v�e�s�=�*`�i�`��<<�Ŕ�M˾Z��o�����R^���x��۷3bĈ�r�+��RRPP��~��'��<�m[�|F#٭%Vc$ �2|��s<xp�Š
+�W(����躞lM��>�9�ǡ���Y���VV����GJ!ڞS.���I�*����������0`����a�~r���g��v��)���<eh��;�u\�n��>�݁K.�$9����v�
���w+��Y��}�<�"v�|�h�>etuee 
+%�5V��<꺎eY!0M�!C����&���Z�Ʉ�izV�j�R(�.�eY�U�lRwH�z�O$��ܿ�~�����۶s�
+Pi]��>C{p��QC}f���6���)ZI�%y�y�B!���l���J��c����\�_���I:4��q��^z�ٳg71���
(ɧ���
,&J���z���Ԡ�H)�mWWLN5'xN]�	��[���c�&�o�,h�\��xG:Y9'�.]��1�P(�����O:vUK�^˲�,���ڴ��^-o��
��������n��HF�5��y��n|G-�~�
+����B�BL���Y
+\Mc����y���~��y��=�����ʅX4x�t4�~��jpt�����jx�;�@���|�Iz�!l�-���	BP[[˜9Wa�&B�>7��u9۶),,���:�P(
+Eפ���H$�����ÄTUU5y���@ ���q2X5k-�@9�)}�����.tdڍ@�Q.d����#
�E�>uu�wJ�tĕ`�p�7�|����*)��y�A�+嘳'`b5�U��l�!M
+��Z��4�I_溺:��˓ƿg�[�E8\��kTTT�����d�@�u��N8����*
+��k2`����+��)����x�&�[�ۍ4���k3�ߛ����C����jA�Bp��瓟��Q���M�"Ӳ
A�8/��~.�I
+E��G]Wnp#?Y
+^M�o߾�p�
�=�[��)c֟�`�
2�
Y���1M�
6�F��NK�o,8����f��a�bQ����ҥK���ض��g��!��bMzB+
+���2p�@JKK	�Y��;����'�2|����|�i&��k9�������r��f�����
+s��m�=��s��a�?�x&M���&N��9�C]]5յHis�s���̔46�w��J�R��H�½�����뎀w�}�k���[�ґ,�vZ�i{����^׫��.=��!}�j/m.�e�8UUU�X���C�6I���@ �֭[)++K8,,3�"%�@@��+
+Ew�cr?��q�~�o�������y��/-�3�<CEE�@ g�hU�{
��z�:����&�F����k�=��{֭[�ĉ���[��I�����p���RL8�s�	�� �b8{�g����5e^����y��U�{���.�M/� !	�	�TQ���W.� �U��A,\P�]�
"�
.�JUBQ���H/�ɴ���k��2�̜�L$��_>�9���Z�Z���Y��l
i�?�B���
+?� A�F����9�Ô)Sx�Wv��RPל�Ξrp�+��j3	A�����0EPIĘ�F��8��7n��EV��CRi���,3��Jlm�d���?{{�_&H� A��A�X�*�lMٽx��eYѾ�eYA�
����/~|�������
۶+��$
+�,̇����������(�7����.]��L�SO=����w�>��
�`��V���W8���W��]�Z��:6��4�I$lN�75g\���a�o� �`��8#���͂?��A��ߪ!��2w�\.��2�>��]�M����?ㄖ(���w�֥��	�)E:�CH$��F���	��W_}�|�U�u��)CP[[˄	p]Ӵ0�!����3�<�����a�ĉض�V�	�شi�aDIi�& ,���iӦ
+�����/�/Y�Oyrpq;�����A}}}����ԙ3g2|��~�l6˾��˞{�Y�>|8�?�|�϶X�444(��}���k�/8�v���9=��E�cR���MBH?���xDɷ�֌7��u�n��u���I���+W��������s�9��N�|4$��g���"^Z�����,!���aR[[�_7L��t��T��h|.���a\e>�g����u�m�7�e�dɒ�$�	$H�`��k��Ʋe˶���f ���]�,YR��M_,^��t:�]��w��ܹs��������������}����K��r�J&O�Lkk��jr6m��/�Я#-���/d�ڵ�]����o�/�ˀB�;%>5l��)���m_����5ġ,jy�=���#Q�wK�.�ޏ4��
+���������d�IbՍCJɨQ����gʔ)�B��/s��!���2�2��yz�/Y<wMB;�}S)�i(��za��!���yn�PM�0�R�T1����
B����[�E��c[[����ֲ�{DY�$H� ��	۶�,�4�I���*�*�Ԇ�����C7n�q,��%�
X��ӧG{����v�N�~�z>�p�~L�\@ww7W_}5.�����/��L&ìY��tϛn���wߝ��fǡ����c�6<�,��,Z���S�I��Nb����}�n�Y�Pܺ	@�y7���sR ��S�<
ܘ'�E�%�}���tT���j�*,X��ٳ�MHk͋/��G?��]*9��v�	q�d-���Ҿi���o��r�
+�z(]s�5q�}�M��+V�\Emmm4w,�f[b�J�RT�9Q�'H� ��
�Ԑ,�U�@I\,�&��'BF��}�/֭[GWWWt�����m�ݸ��{=z4��߸���=z4��ͣ���3fp��r�W���={6�ƍcƌ;?�0*{L��IcX�hÐ��E6��]����	��uK H~��p����Qb3'�&�E�b�=�}�Q&L���/�H:�N���Z�	�����4�<ð�ZE��U9d����I�R��x�s1M�R��ϗ�� IDAT�+@E��R�L���d��m��Դ�	�$H� ���iF��m]��d2>��;n�6��b���:-Z�>S�E�}5/����H��^^h�_���×�[�▱������q�:�]������ճ(�2E�.к�:�{W�Ȼi�=
�,�$�d"�
+_�y�ZPq�E�`��'��H:i��֚�_��?>�L�`H{�@�*��-\�V�Y��2i��i��b�*t����?�L&�_XJ�
+B
+L�r#+��
+�ܶ�hŊ�^�:!�	$؅x�7�_y�W�GU�ǖ/���&t���+���e�]Fss�v�B{G(B�O��<��̞=�}�ݗ��V�X�…�r@CH>����=<��co9S�N�?�{�;	w��")��n���ްMϯ绁'H )�Hk~�ȱ��R�BsOω4Oʼm휾��5j��$J��ҋR*����־��t^�V2qk���W�B
+�JEn�!�#l�a���G�q�u�h-������"�ئ�\.Gmmm�lK� A���|�����}��`3"ﶾ�����M;�g�<��B)?$����y����FInw����
+���O�P��(S�L�������[��o}�[[�x�p�	h���w��K���8������ ��9
���w.) q~L�f� �zt+W.8�K�u4v���[-@�Z��O}�S�g$�F/q�A$�4�)o���۵/����n�G*��}�p>�ɕ4���B	�d$[�*Zk����d28����'H� �N�t:M6�Ų�m����a(�R�3�������������#�v555q�x���o�&M���gĈ[}�#�<��;�'�x��!ڙ�:��}߃�Ao�)D H����WiS/'V�ov�ސt›T�q�477Gu�$�&/eP�xdž�R)���ɐ�
+��<��3T���k����˗cfPp��Xww7���z�dM	$H�`��8Q��j�P�U���c�=6JT[.��Q�fwj�m!�������e<
BE�����Pl�+�dyC�K*q�L���hkkc�̙�'@�!3(��P,��R��Cۣ<E�XDW�������d�׿�E��粉'�	�6M��7���g��2�͚S(hmme���x���{	$H���'�ݖJa����e˖U�=TRg�Y\�%��c�;�w�%"�?��s�1����c�2�)�W�i�՞E��{^� �D|�	!X�r%7�|3B�H�� ���T*������G5�w�'�aض����<�����<�\r	�r��
�U܇U1�֌=:Rh��Joue2N?�tƎ[��)A�	�|hjj���!Rl�aF�/=��Uω�3g�dΜ9H)4D������7��w��2���=�X�������Lu� �_�%h�jO�"��+�%@�;l_v�e{�u�Q<��\w�u������|�	�`��5k��z*?�5��?��N:��7�5=�N��K/
Ji��W*Pl���g>�~��_���}��J�O�T�;� ��36���i��~� A�;1ƏϨQ�0Ms��)!�嗤�5jT�=*�o(�����������i��ƢE�Bl�W�N�(��,]��_��W(���������������-��>}:�G�f��jWB�a���������n<�@R��T����o�=
�WR��VzH
+��)�\d�H�`�Ck��g��<���>���N;�4fΜ���R�Tb�L0��?{�l^x�����s�w�`�~��_#����#�5k׮4R�����\.�5ttl樣�b̘1d2����p����k�����R�6�0)en�$
L� A�]k��Z(�"��`�
+��w���/q�*߶nݺ��]�
+�`X�r%��v���8ӦMcٲetwwp���r�W�h�"N>��AXk�O<A}}=w�}7�>�(�R�R�ļy�vJ!7|�;~��Vҹ�a�{U�	� �ޔ��Oh�׼� A5����塇`��I̞=�{ｗ����.蚖��ɓ�^����aq�=�p�gF���,CB�n���	&��f
M:�Fo�<�>3��$H� �@(�ˑ�>��Zkf̘��I����^��l6�CC���6��nQ��|���qR����g���{#��e˖q�G��fy���P�u/������I��Ԧ�߻��.muN�ky�=c %@�/%H���֚n�!r7K��C�>��G<��a���m�X�p����b��M����gQ��o����YfW��3�Wr'b��0��� �3z{=���7!ࢋ.��矧P�|�������_��9>�����h��[l�ޡj�ڟTܥ�9}�5�}��B=��[5#4��;�ӑ�Ɔ���}ӿ���Cy�4�}�ߧ�"i>����T�[��@�����
Z��b>��yU�n��[lC�Q;t���N�!|=��v)V��A&%o�u�wߺϛm�R*r㯔i��s2�I�ӑBzÆ
������<�L�,YR]�����h��qz
@�y��"i�۴.?��8�����K�Z3q�D���r��G1�Ca��y�>��Oq뭷�n�{��y'4��s���I.sݫ�n~'�_Z��O&�w�;jN����>�9�����--�.&�k�!�ѻ�56�c��6�=Egg'��9�PʍJ������{��S��:��n��
^})��Ȟ{�m[<���(Oa����Ґ8N�q�d3(�Ð��0�aX�$�LkZ�M�?��m~�
!$���i��F*�
+����ч�����kbm��]+*��5vr�5"v����)�m]D���j]��Q��׿���tN�.�����-
���Ӗ�C�U�/�p�>��ʴ�˂{��1��ia�c��= ��~/�Ie[d?��mKPkS��(&R�jt!t���
��-�~� ��ã�&�z�[q��ߡ�#cP\�'{���{�iN��C�4='l[xr���J��3:ަ�]-�{���gEǷ���C%�Au9o�I�t��{�A�Sm��6]Z#^x�l�`�}��PRG�a��T��@{h�0
�����*Y/�/�7'��YN<�$fL�;e���L6�F凲!>�R�$���vw&�a���+���n��������җ��{��^:;;������8���s뭷2~�x�-[��(
256��/����dI#�H-A�5<�͡�ex��y@€'H���4���_�a�-yL�w���r�����3f�/ ���K�"�A��'�6��X�ڌ�2��������7��!��>w
+#G��\v1_Q�%(�&��� e(4BJ��ޣX����<B�\¶L
{
+81^I�+�	��n�m7�[[��@i��0��������н�H=������#��P�W�Е���Տ����Eh!T�#G�ᑄ2A����x��N���^6�t��\��ժW���-Dpϸ�'�Hm����-�S�i	�&z�zя��	w ���pS�	�PQ[�G ��&D��q�O��">N���{�к��]-"M����Z��ѳ�uL?;�ҭ*�h�g}�3'�+�zE	�����>����3�KH�ݯz�iSR�}�S
�"��E@���j��w��r��+��
,}��5d�~P�Ǜ?i�0���޲�P�*J�ب��$�ϵm�4"�����vKI���5
+���r�G���[s۶�6m7��g�;�<n��f̘AOO7�7�����q�F��u_����G�Q�-�+MMM�q��K�
+�s���wl������9�䓹�vO�y��j>�2�r��*���c��c0����M-	$xk�S'��:Ę!�����瞋���{����tww���===��>���scm$�PP�H��n�4z���5\)E&�f�i�>|X��	�@�ْd%+�Eq� �͂a�/�ȥ��?3��B䈟���#�;��}�t%C�]�D��H�D�{�F)
��Y|Oј�^�h��U��)
#P�=&�{0��/��O��A�����8|!D ����@�"�� ����&�
]�Bƞ/�1�J�}o[��!z="O�
�D�t� ,D�ڷ�
+�P���[��/�@/}�
+!�6c���d\#� �G%�H$J�D�H	$�ޛ�~
^HK}��� ��9�K�0�R-�3R�u�M_��#"W�ϊ�8��4�N�,�}�M
+��������_ZW�V$�j�BaW�O������$�3�R���1��-	����
+c���-9`y����֭8��(�KddO���q�X�[�|��
-\ϫPW���^R���wZH\��K.Aᡵ⮻��}D��K���$L��mb��x�X��$�
�'rX�f�.�އ��Q��1��D��ϼWk.r%@��%�˲���$��.3��b��n!��;�R�H&S�m[L�0�������<��0���&
<��ŗ^�G�^�W��uZ[��~�F)
+��%������u]��4J)r�����ֆ�y���!�\.G*�����r���e�Y�|#F�$��H�\�*�̟?��?���l���Z)jkkٴi�R�N8�/��|��f޼yy䑴�����%����=�y�֯cђ�L�0���&:::ؼy3


X�ň#X�b);Egg'�t��vۍ�˗���p]����c�&���QM���N�ulhl�}�&V�Z�����ڵk���Ŷm��<�V������'���ʪU�3z�Fkk+�B���V,ˤ��
˲�d2x��R
+!v*Œ%Khii��,;::7n��<B�b����I�T����R١���\]۰�m���<�L�R�D6����O�\SS����aHl������QJ�qc5596o�`��V���S"�J���CMM���M446�ys
��lذ���&,�b�굴���N�.�7o����2);�a�I��)O��ڔ�R���M}]-�R�L��q5�%�J��6���)E�-�f�j�Lڋ|�Lʲ���f����3u*f��2L�1��X�E&%)��m�5��`͚6Z[(�sL�����eJ�
�]�_�
�DRv2)�b�ö
Ƿ���{���
���,��`钥L��;eG!�@H_Z�V
+��m�=��4L)�ǜ�8�������(����%�t�\&����:�t�r���@J�!]���jj0���TB�t���O�|�t6�v]6wu�I�I�����u]j3��2�e��/H��6M6l�DkS���h��%�8�LO��	M鏃��ȋ�0L���i�*Eʶ{�xA(^�4��󘄊D	J%j�I!_��>�qk<ϧ��0M��F���9ex��0%��6}�i�B�s�����a[�����q� �*�
M����@i7
+�2
�$����D�R�H	�b�T�F)�aH����iDB��z�f�������i��h
+/(�*�C�1�2q��u0
+�RӐxʯ2S.;Q����J�����J����@�W@���T���@��IY��2�<�i�Xx^��&��1$x*Tj��j��B�N��\{�o¿��@�}:�t(|�!��騿
C�y���-��� ���E��o���n�a��Ҭzm#���}�D�Vzhj�~�7��&�	�H��/����s��ow+o�w��uV�\�ƍ�7�@��p�I'�u�Խ�N�a�%!��{/�\����`e�c�[t<��N��Ώ�L�Ӕ�e2v*r�t])%�iL�/����PZ!���\L�$_�#�$e���%,���<_�H�9��s���>Ρ��y��4��xZ��R
+۴hk������u�S6�u�8��eZ���N�좔�\6b����T:1�RJJ�2�mQv\6������3��s�R ����Mݛ����Յ�Ɔz<��\�5kײ�n�A��K�XB)EC}=���r���==yr59@�������q��,�eR,�|Aɺu�6l7��"R8��+J%�b�@�uilh�ˠzI&���'���\���6Zwk�T*Q.�q]�a#Zym�"ƌ�S.S,�H�6�0���о���G!�����r�L]}=�q��L�4)�J�%��2�t�W�h������8%::;ikkcԨQ��E��6%���&�e�v�:��I�3���ׯ���9~L<ϋ_�7o��������Tʿ�eYx�G.�e��5477c��]�(�aZ&�aR,I�2Q>?�Gm$��y�Y�v-M�M��eY�\��u�s�=�+��JKK�L!�bџ���)<�=z4K�.�������S�ˑ�f)��R�RYI���0M�7m����L6G9��/��M�MdsY���ظ�
�2ٰ~=v*E*�����b�D�\�X,2j�H^|�%ZZ[�f����k���1cX�v
&L�c�֭����b�H�'O&�a���7˴���$��AH�+0r�(����\���͌;�Mm��dӬ]���9b$�!��)p��L���:;:)
+d�i���H�u�u
+�ҤR6�R�����,�����M�&G:�¶S(�(����y ������G���E:�K��aR(����wǴJ����X�E�\�s]�N�t:Ccc_[�ȑ#)�lڴ���ޛ��v\�es����r�\��T*�i�B~GG---���h��l��]�X�ņ
>|8Bjjjx�W�<y2���H!q\�rٟ��T
+˲X�~�l��˗1|�r�ƒl��KzzzhnnfӦM��K6�e��͌5��s�2v��H)��f�������e�m7b�&�|��lˢ;���B�������uih�g���466�r�6˲�R��Ӄi����x���4i/,���W2n�ب��8���]�f
�����L[�FLӢ�������S)E�T"�N�.�e���IKK^yɟ�őG��%K���M&��a��}�9�q �b�B�@sS3���himEh���%����DgW'�eSSS�R�o�+d3�D
�5hmm��:�l���_���V�������p$�A�,�_-Z������`U�žEG�ynda�RV���۪X����z�#Z�4y�[A�o-�<Ϸ.��|�VD>�HCƬ3�ICx����K��#�!pӲz�h�g�o,�d�����?�
��A����%�=�ax��'Խ���}Զ Q�1w�ȧ8��t
�d������� �Fi�'�2}��aHT hJ�D9�4��
+|K�a�>��>�h7h����G�6���}�=�EH��T�Z�	�Oo��q� 3v��B�c*
\�Aj�R �@H?��v=�i��ʘ��SF�w+���+Om]]�|�Tҷ�mҷZ�kn��:�?�1��1�/��u@;$��-�*ȭ"%���MA�F,�q�f���~?�t)��J!|�
���a�K����^������7���cຮ/����;��/)�J~�ˀC�_k��2��?�/���Lk/��(	!B <���3 H��=�ŐA&��>e׏�vKe0
?�Đ�z�YT��B)�iP.�2ip=�Ųm��)c���3-?��!��|��rٟ���r\���K)����\i��������(�4�`��h��J>C�:��Ŏ�Bd`UW�b;���ȭ<� (���,+z�h]1|�%�����(��Xv�"9�eY
+��lD��b�l6�o���_WІ���Ox�a���
��qŗi�(�������De��ؖ�R�྾���],˦������
+!:T`� �0��xJ���� 5��_{��V�Ѐ9�>C*�b��&��&��� Z�3���)��S��X�����/��fRQ��R��n�!,��E�
��:�G��:��)��0,?O��{ȥs8�
�u�T.�I���޹y3�
�tvwS��A
+p�&�y�a�
���C�])UQoq�����'?���Z�j�*���/U?�������_�;＝�m��S�I����A=	� �BhQ�V.��s���{�M:iE�\�h�ZmE�P��CB��R/��� ����I��H_6��S���QJ1��(�3���c��bځk��Dž�)�U�C���w�T*�5]�j�l�<��|���w6��.�����w�K�s�hnC��(N5*&�a�q<O+<���lq�= IDAT����܇�tz,����@��V��$����h)�'A�
+xB�M�!�),�0$ʐ(���J{8��0�VhO!���<��D{�O@�%��0�E:�����u|��}�NXH$�SZ�e��@�i?��L�
+!+ 6W����J���J�=�r
/H�'߽VJ�x���@y �Dh�
P��_�	������i��xe�@b�]��Bxe<�v���MK?)��a��&�a�����1PA{�|
F��"�u�� D
�r}�k���0��&(�WCP�%Z��a�Y�mZ ����-y�����HL�O�D(�i���"1��m�Xf
+���qJK4��&B��g��Q���@)��@K���0SHi���f
+���H�0Q
+�L
Z�&���%�D�J����6 P���A!�D�R8���i�^Z��,�hӟ_ڐ`H�h��R\O����4:l�4}��&�0��DImXx��JHR5�訏}ŀ�(���N��s
�D&ZJ�a�"�������&JK<i�)��%e\v*K�Tt�����l&��(�+Y��L,k���T)_��R����+�����e�bJ�"��چ!1�����s����ն�\'X{%e���4MLSk����%��e?�$��D�0���`��J��d|E���z��"�[+Jj�Y2�4�T�L:
Ja �$XRb 0��2��@	N�|Rk?Q)�ͤ|=L���4��Wݑ�Ԋ����`J�T~�A�4��5�(E&ec
+P��CC&��i)1]Kk��4`*��4���4����+H
Ѭ��x���'w�}wD�7�|33gΌ��_���/����>\p
�"�b�6����[����������|�������'_�bn�n
+<�y��T�m'H��ӿ���9�hiiI<
v�Q�06U8��y�G�;�ip��G�5��)�B)�p���/�S��RG�M�M7�ć>�!�jôp�.��U
+X�0���YW���>�9�<�L��w߀
��z�\<}ʼ�j�P�4̷r��l�RT--Yb��
�X�DY�*�oo�K�����+��W�*�U��(����蛹+��WvZ<�}E��Ȓ*�gs 4�����?�Z�w�eݯz|�tn}�#Z���lM8������䙕m�?�~?+�+�%�]'tE�.����*�R�.vN�������-�Ӷ�%u��L��~e?�gG�-��aoj]u�}�G���R�����4q���u��`��Y���Oe�h����C�UIH�UI
+��������N��:u��o �a������ p%tXbVI�D�an�h��[�S��zI)#/��ܣ��r�Q��%��cH?U��!��;��]w�1	7�|3���db��/�����;n�.��@}���e���h�����)�����ꉯr����8�k�9;�$x�i��|�+�}��<��CI����N��o���I���)�]�ڡ�>�b��S,xy
��-��
+z(�4�R�b�
+֮]�$�2�/��_����o������pJe��\��?��s�8qb����p����b��c�s��ݷjU
+
+��Ğ���2v/�������fD��}�EdW�{�u"ʞ;��X߾������A���yF����Tޣ�u�;��]E����ۆ*���+�'>Oc���3���o/�Q��D�U�^����j��X�	��/���P��h��=sN��H_ڮp�g�`�*�*�<5	�ӧ����W<�jma���s_*��r��O_�ip�1�r_��Mq�֮-ۚ=�?�m�uuu��i?�?�l0.l�,��}����h�?G�
s�έ�� DưL���ॗ^�'��s#�_)?�G�Y���o4g+?C������r�'�O|�B�����fW-��1`��t����ظK��
+���%���M�5n�s'H�W�����gŊ�^��$�K��M�o477G��1�qo��X*r���:n�лG����b~Ĉ����\?_��XA�-���C�<���m����5�'O&��E�;R��RTM͓ �VP�>}��x��@D�	�<�&t�[U�oǜJ��;'Nd�=���3�x�i\{�o��ʡ����]��A�sq�BIAW!ϗ��e��ʠ�w�w�B!�I��V����]�v�mv�a����駟fĈC��R���v��կVafv^���'��
�@g��М}��(�@�	ށN�ٜz꩜u�Y<���I�$�n{I(�F��F|���4M���:.����6��烌�FL�QҽP)��穫��u�4��Hs��'���8�ߣX�A��6){�~��</*!&�z'�]؎��&x{ҧ$�C^����n}���n��/PJG��|�� Gž�؞���xx����cJ�(�b�~}�0��$H�#y��<�+�ǯ�`�6�y�{���ӆaD��{	��-$R��6?nHM�\�����;J���V`���~?�s8��ù����[윀���/ISS�.CN�K��9zpO�bO9YE$x�c7�x#˗/gٲe	�`��%!텉C��P�-��-�w�y\}��|��������7R(E�����u�ý���#z��$��կy��Os�e�aY6����F��0�(����
*N�I��w��àX,F��"����
+�r�LOOOE2�pN�Ũ@H�!=�%�x�T�0*��s�0(�}a�q=<��
+C�z�R�"���lwww�������هs �B�פ����O3j�(^�u��t��	֬Y���~�����y'��g:��
�Ke6��iYU�3v�X��v�w:@_�~�{:�fذa444l�"�i�&.���]�q7����������%�H��"a�SN����駟N:%�v�����(����{�0C��?GqW_}5#F�`ŊQ�d˭T&�V��f�ĥ�����<����x����M7��Tψa��g��67�x�	zzz*�=W��n_��…���H�RC�p����b��#�<��?΃>)���ض��̙3�[o���ﾓR)O���4鴅i<����'W�Jj��]�]��gW�?]��7�b���캜s������C�HgR\��kY�zU��q�ӟ�ĢE�"�Z��a|s�;===twwW�ۇ�e���rvk��I����
ɲ��&�$�JEe3�R(Oq���/��ȑ�8��G3n�(::ڑB��[5�a�\���}��A2!�!tR��?���L�,J����*����~�Rr�J�#A�w�@v�-��x�b-Z4d7�	��
̘1��v�
�u$�H))
+\{��\q����77\Ӧ��ȑ#����p����e���1����<���E�ׄ	��_'���̨#����_�~�߰q��D�N��\��/r�w������[ׅ�~��r�)�~��|�ߌ�]�6���g�̙̚5�ϝr2��:�/φ��:�ڹ���vm�%*����"�=������t�t#������{����tuu����������74��.\Xq,��&s,��ƫ���ʕ+#�����ڸ���������.�����??�r�RF��C�B�z�*���?r�
38����w�>tvt��d��3������Q����(�B �={6��?6lإ�?|��L>xl�'�i$� ��
��vw�}7��sw�}7�F�bʔ)����I�$xۅ�tEݡ�8J�-3nܸ {���({�'�e��*�[��eQ(شiS�W������?����L���VѶi�B���2�Ld�I��-�,Y��'�|���_�y�%_h�<7��5o�,|�%^�^zq.�V.���^�Gۦ����K̚�^�u���:����^k(�֭[τ�{���?�o���7��������g���~@.�cXP[�2����"9z�h-\DCM-J+~t��Hg����Qv�(4�e���Y!�g�
+��m���q�}���SO������-�,�$H�}`�>��֯_�aJ��
���<�̳��,���ׄ�W[�IP,ɤ��=e
+N���?�),�
+��4�iQ-	@CC��b�f���v�ܥ��X��-un�s���Ν�̙3��_�14}1��w��s�����w<w� ��+$�H���?�_�������/"�`���%��$�1�G�wh����������`��\t�e<����Z�j)��ҁB�(YYh�9�C��<J)f̘��͛;~<2`oҶ	��4��ޟJ�H�R��2�[�'�z�o��dk���j��HפA�����c���&ä�&�n�:����Y�x%Z+�N����7�)ɴi{��ˡ��a��������=L�ฏ�G��Ɔ&���/�կ����{�4���������3��˯,��$��4m�!��o����G��{��?˴}����Kp�
+�Am��_��Ǽ��g(��<��s�76����<���ho�u�����|�gp��ߡ�����D�;�破DJ��&��B�x�kH�b�)��[BG%#��PGGG���m�r��w�)%���Fww�l
+M ���MÇ'�ɠ�����{�.3�
+�K�,��SOeΜ9�q�\s�5�9�+���\.�)��Š+8����< 3���I�&q�M7����<�����ZӥK��L�����צ��g^x���o�J'U$x`���U�O�:�����⢋.b�ԩIG%x��������c�6555�г�8`:?�w,�\s�5�;6r�4d\q��)�J�c�9&�ڇ
+�O|����7��ֶ��{M������������01�\
+�;7��V����ʫ�1m:��t���S>�iE��0-��:�]�(��H��*�J>�|>�Ӹ[��Z<B�떰,����<z/�z�&N�D�X�����|�L��e6|�>�՟c��Q_W�믿�>p�<3��y�l6K6��-�B��s{lظ����g6n����w�׭�����*r��.�C��#����c��g?��
+!���\K�}�J�H�Of	�(�{ߡ��4����-۶�� 6F�Oh�9��C�</�n3�)��k~��{O���ESs6�c��~I�*���/�Lgg'�l6R.���eq���^ȨQ�hii����E�q��Gs�i�q�q�UUą�r��G��_���}�k\z�1��2������o�+�X"�'H�֚ٳgs�
7P*�����'�[NcB�yf�r�A��8nE�W���>�UW]�+����+�={6���K0��*��0�_<��9��'s�{����}�&
+�y�:�0,C���Z�;LW$$H�V����Y�1c�t\`���'�
+�YӒ�]���}����ж�������5\r޹(�V��]=ݬ^��uH�&vڢ�X�
0�_��P(�N�v؇x���8�G1~�h�?����X�E&e��ת��T*����3}�t-Zȝw�Ň��0�e0v�HF��4+�Xƹg����G���S�k�ē>��c1��x�
~���?�@k�0�x��d�%���B ���M\�LCC=t'�t"�;6aH�=��0�}H�z�@`�&MMM���cǎ媫����<�>��9b�S�4�@�]]���G?JKK�v�w@:�f�ĉ��a��ż��|�;�aΜ9d�٨j@<�i0a���;�ƍc����~�Y�(Zk�~�I9�	v�9
p��'s���s�W��{&��-��$h�t���f���A�F˲Q�cڴ���[��aʔ)���q�"�i����,�!q�+�o5ь�;�f]0m
+0(��٪��J���Z��%x+���A6���|w�c���j�����6�O��n�Z&M�̒e˸�sB�/�Z3a����"+bgG'^�
�Vx�����+:��8@p�QG�b�
+$�L:CwO'�֮c����6s�,�ɓ'��d�k���8q"�a&O��ԩ{�?�@.���dl��[�Hپ�r��v���<M�-p�o���mr�\��#%s-����8���
+��i1e�h����_p�����qC;�Ї�x���0
+��t:ڇ�d�0f�X�{��|�;���/|�/��i���<Т�k�9������&�JE�o�>�˪�>��0f��R����a��w�0�|�r���D���	�� ��%��v�m<��S<��3�D��o�^gbLӤ�0-
�O�Z�4�����i#"7a�e8�����(;��)$ZI�s@� ��
Rv���[555���d����c��<��S�S.�\�ys��S�� 
A]m
���|���͒�/q߽���G��*E6���}��̟7�쐲�{)i1v�(R���ʤS��s'�uk6,$���
+���F�q�V�t*��+��\�֬X��b��3?���k;z_��/�����Q��=�tvtb?���<�i�B���ap淿��e������iRؾ'*�g��v�JE�(�
����G���?r��;��qCh���%��<<�#��t/�2�B��1���_0u�i�z�����)� bwMMMT^p{�X��`ܸq|���e���c���z行?��k�r�1�pꩧn�0�����#FD�X$H���&�
�r�)\q��Z�*�oZ��F�Z��R	�|��2Ʊ�y���!�FT5 T(�Z��B���P���0iS췾x��QJQ*���K�b��)̝;����:�͛�O�S�|��yG"�4X9�®k“6���iĘ��֚�����������~>���ꗿB:����d����=�=�ؗ;ﺍ��[n�+{M��i���4&�9)�����Nmm��cfٰ~��m�AH��k֓��0M�b�H}c-Z+��^��������Q���og�}��������6/^=ǟ�:Q$������F���h���+O�(塔�ƨ���3���Я�E���}���p~{a�Rh���;�Zs�A1o�<~���E�_v�e<���u�Q[� i�Y�f
��ַ�RB	$x׮���߸���yꩧ�,��R*E���F:m!��|E@�Pa��Ϣ�����(��'?���x�+
h!�B�28V��_|1cƌ���d������W��~�C���|��A�?��L��O$d,Kx���B�B�T:���J��̞=Ӳ���~�?�A>x�
ͣ�=΍��=�O�_:�G�{�]|)�x�i�[P�~R����L?��
+��X�Iss3cǎ���\ǧ>u"�3�e�2y_ҩRv��bذ������23��ws��C��;�������殻������믿1��axN��$ؾ�m�L���sz?R�a!0���"��q��ܹs��z!��3::?�=�Ϝ�U׎�}��	�������իWcYV�	$xW2�BN<�D~����ܜtJ�m�%����}��<y2�aUZ�����hӷVJ
^��O
+�S(�ʤq�⬳�b���SWW������(�8Ek9'���k�࿅#I�͍�հʹ��w�v�~��`�>��Տ렽C+�]�Z�;x��o���۶�7o���_�{���'�}��ݶ��g�q?���f��J������|��hÆ
�q��R�x$H��]$��ϼx��tu���;Ύ����3喽w{I/�$�	1tU� ]U��4)��OEP���� �T���P!��ݔ��)����;�w[�����|�u_w�3gN}��NUUo��F�@!6h\麎+%�H]7���~�@�!����f�B^M�<à��>�q��ڈ'���J~���\P�����z�BlL�����@먺���/]�c�5�{���G�:ߡ���q���{C�?��7O׶o�`��]�R�T��;�߅�?ٵ솆ZZZ�¦@���� ��wo���1c]����"D���x�GPTT�������z�L&�̙3�5,�������A���RhR�)�.�ߎe�\�;W�U�4LJKKI��]�
T{�.�L&pWb����d6��څ��} ��c�{>UWW���p�� ;l2B%���� ������|�;�{�
Q������:˲�j�����\�E���^{q��s���dɒ��C��٬�<��t��V6���* IDAT���>�p�džf�!�qPJa�t����@0��f�i��@�	�hC�х��8���۱�L��>��0R���Q�C�"D��`�6��Y�uttlf����X,F,�dʖP���Gy�!C��b�
+.��b���~�i��n��\��瞻ֲ��F��x��7y��gy����j0D�!6�����)S����s���LS��a���h�|������ض���]�”��9
��iB��
��g��M0	&���������9s�l4b.D�!Bl��}����"�H ��X1c���F��r���dH��x�|��'d2�>�l:� ���
x�W��˘<y2=�P��\�|9?��O�,+$,B��E
+L�����SN	5�!�\���UUU��qL����_����Z�aA`�X,�̛�:�\.�C�0�}��ޣ��h�!B�(]��r���_̞=�ٳg�_����cB���7
+o7b�,��0���"VR�T��}���w�����
���`ժU(�<xp���~��Y�pဵ!B���`�=����?�q�)D����:����s��i��d���O�4
WJ���m
��{PRR�aa������u�������U���Ͻ�3�C����$ϕ�
+�*���Pd�Y\�ݤ�hC
@/jY���ӟ(--����������s����o�w�'�|2/��ӧO�!Bl����iv�a�s�9�@3D�́?,�5>2~|��i���Kq���N:��i��vT���d���<�J����c���Cl���
O��G��������R���n��Q�.��6kD��"�BlI����_�`��a�F7
+_'����8p
�$4�
+)��}������{��'3f&L�d>!B����F��.��[o�5\�B�1
� ���	l���\�&�)�|���{R� U }d��
+���Ѻ�9唓�喛4���n$Ħ�1�;��@������r�X	B� :x.�!���Y�DzkZ�Bxe9��i�p]3
�秉�q,�r0
�B��BJM	B	���x)4�WZ蚆�˲��Mו�zJL����-�̙������Ā��
+���z���~�a�����rͲ`���p(�!�Ε:�Bp��G��s�1cƌpq"��6���E]Z��>B:�k�E��X�����z+`z���K�M� �
+�(��.����U7R��PȆ�e�Dh
+G�R�v�oC�$I��,X_����x���~�����
+S���t:��z�u�>�Ln���hD>���|�c��6G}�ka+G���d�qc�w�>�~�iF��:�{�
�!�T�+~�C}�Qt� ��
+)
+)�'p����)��o��
����em��O
��������
+�4��k�N)���Jƌ�|�!B��b1u�Tn��v�?��P��w#oj�.��%TTT����~-��P|Ʃ�=ԥS���<�����t�Rr9+dZBlr���R�cq**�y�o��=K�J�ޟ7�t���s2���
+�v(��5��_�7f���S&����i'���L�8�¥Kq
Gy3!�L0q�d��$]�"���8Ԯ��qc��F�������ѣG�זģq�m��8.�)4�DiJ����9��A@��Y8�Bl.Hic���l���$�L��������M8��D��u�]ǬY�֚N0D�!6'��G?
+̶���`:?�я���Cw�=�@��h���� ���8w
����4
CӐJy��]�����c��x����Ք��y���<`��ۖW� ���ŋ(+.�(� bD��Tc>��iuuud�n��6F�؊_\��ΝˎvfM�~���C��[�ǜ��ij�g��p�7K
���g��hmo@�t��E
CF�e�u�̚5�<�GJ�e	V�4a)�f�&�I�k:Q3�vۍ���8�O)P�p���Y��m2�v
+�R�Xk,�/c�-L�[h]
+6ÍwC���O��/��̙3�m��z�'��C��9��?�y�&�Ls]���:����/a#�����u����@��>юMӱl�����/�W��ш�IaY�a"(%�4DW�Ғ)l�B�M��F����i�J+�>��qk��'6��K�+�׏�
7��m&�����8�n�5��v����yZ�u]F�Imm-���V5𭣾��x�dI��^~�ov,���,̈�K�V>��PV^�СC���#c[,_��}�ۓ��6��/����I'Q3d(m�hr��6
�_�ģ�{�˰��$��A�����1�W7�"
-o <Ûp���L�k�ӈ������v0Mok�\�}!��Hu�Dpg�e�	�xo��V>��3�ϟ�
7�@SSw�u---�}�݌;�k�����zr���z��ʁ�5�\�o����t:����ittt��O��"D���X��㚦q�gr���r��׆���z�������#Ja&�c��с����J�g�E^��x��tL3�'�2�bƌ��Z��gs�E:�#�k[24���:�ʊr^y�U���믾�!ȼ�?A۶��
Ǧ����;���c�ښ��ڊ�?���^|�m'lKYI9�G�`��� ;�ȪU����d��v��x�L6�s�?KUUÇ
�~�j���
X�t	���w�涛�l���Vv�q<�q��3��_}���3w�����]��{���*H���***�4��(�hD�z^�Q������i�|��'��N\'�\�`��q�` ���?����:z�!~��߱d������[���Y�`
=���z+�����������/���C*�b����pc"Ė!���{���r
+>�`�(_�1�1�RJ�d3YZ[[�&�볿�
�Ш,������S <���AJ��
�->�|g�����q�A�{�Hƍ��z�%[�|�SQ�4–
�g�oe����k���9M Q�������H��B���_`�]v��j���
+���Q���?��<�Q���d[�%՞�PSQ�˖q��'r��~�G|ȝ�3Æ
����?���q<���b���*��s/N���~N6c3l�h͌?��믽���:���6R�hB���e�Gi���F��ˈac;.����$gYDL��>2�t��joo�(u���y���)))�$�?�A,�9��뮻��/��_N]]��1l�0=2òa�ڂ9������[o�ų�>���!B��`�&��������53��j��P���
���}�G�]�R�iZ����#�l�b��p����]�7v����>
+�u6l���H%q]/"��H��U�{�
+�
+�m�qޟ2
+��۱{�z���<�?�
�w_��U�ޮ�����S��<��{��J"�(��()�(�K1z��H�̌D"A�f,o2lP^^I:����ʥ�W�?�2��b��AJ%e��gR�=��r�����?Gue%��f��ǀttt�Ng�����L�����b�ȡ�X�@&����%j��e-�����R���W��9�sJ�����-�e~5�ӆ<�p\��׾�=�~�����YZX��Zg�t����[u�V�vQ��]��4#\u�U�?�k~�S�~�_����d������u]Z[[7ʘ�D"����`3��<��?�3fp�'�|�r�����>�0h� �3��O.G�7�pÆ
��_��!Bl�k�>��Å^���
+1�vЂ��y���i�F6�����u�i��LJ�O��1���\����#�2f�`&�=�w������S.\J4QƤ�{RZY��#2�]��i�YCaeӁ��
��{�i�
+��	!�d2]2(�H�����mﮔ�q��w!Q�S�.��t	��j�l��! ��SJaYVpζm��~����۶�z���ץ�B��~����u�d2A{�w��~�u���f�<'���Ȼ�?�?�d���r�����9
�
+���e�t)��V��>˲��Y��ti�¶�)��\Ut]c��9�?����+<�d�믿���
+R�Vt]Ga�������3�S��q��CGPY1�ںZ�c���2�\eMә?o	���s>�M)n��u���W�!���˲���144r�,�ys �N����s�>�/�����>�X,�f�~��:�	��XV׵q]���#����H�t9����{c̲r��C)��}#����L\�8V�<�����6����m����*����}^����Y��el�r��:���ܜ�X��l�U8�DJ�[)�m�s�.�\�_��*����>��\W�����@���pݮ�uY��	l�
�S���%۶�����kS�e��k;(�}�p,�;n�%pl�JO��mc[�ux��0
A��3��?�����$�������L�0�SN>��w&��+P�ʏ/;x/]�?~��³�����7)�4 �
�>���7�(��D��/��u9餓����(**���o��O���c��w����_D3��{�͏~�#��4G}tHK�b�DQQ�]v��v�\rI����
����1!�ata�2.<�L'�\\���3��g�駋���;-�"^^IEY9�-��5"�AEY)�t�	v䣏> ���OQY^ɽ���C9���t&MYY���TUU�J�B�F1�t:�eY�R)�
FSS�d�4ill���M�VUUua
+����{5MC�u� ���ގ�iD"���L���w2�$�`Y�L���r�%%%455�8���@�f�TVVb�L&h�X,0�RJ��,��崵��ljD"A`�T*�����"֬YCyyy������_z"���f��_��˗SYYIqq1����;$��@H"��4� ����6���B���DEEE������Auu5����fyy9��L&�={6[m�UP~"���m�H$pM�&+��`�6�m3z�hR�#�J�H$�:!ͼm���q��lPFYY�\.7'N�}u2Z
+��QVVF2��[n���"�M�x�2��ɧ�������岜t�I�9�H$­����[o͔)S8��S���D�5�.]Ġ��Z}}=Æ
CJO�R[����&S��ʒ%K�m;����?�u��D��P���`�&O>�s�~ΤI���~�…�1r���@
��bk�L�Ѽ�k�xi;��N���[�P/�G���𭑄����B�<�ϻ,;C,��0<a�F`��"(G����D�˳5�`��yl=f�`
��A�?W������Rl���F�������0�&�D����h�i޷�	AAV߅H�$�d;�Y�)�r��4EEE����O�;��n�z~L�.��iz��i"%y����WGI���k���%��=�t4Ѕ�e+2"^ٚ�-1L�u�*E,nb�&mm���ӌ3b�(���[Ģq��>��q��r
+'Nb����0L��ihX�ر[�Ẁ����}�����@�w��…���[�K;��/2d�v�qǵ^��石d�;�͆�QJ������r;��˾��^��x㍼��<��3~��!�"D�-�
�=�ܓ��ێc�9�'�x"l��)|�w„	8�C:�4ќx����1��T�ɓw�څ-ƶs�r6�l�t�%%
-�$�I�R477�ڑ��9�խb�SI�Ӽ��ۜv�4�=�e_|A4a���ضMQQ����0쾖ײ�@�>a�����_qq1������rH)�@,#���gcc#�X, �|�����t:M,#�J����0#�dȐ!A}fΜ���o�����"��XM�����l6K"��Pu]'��b�
+
D"� �LRSS�ʕ+I&����Zv�m��8���ض�eY�A2�d��������f�H6����"x�i���q2��h���V������\��A����@$!�`�m3t�P��4�H�u�
]�Y�`
C�	�+mmmD"�@�����ȑ#��?����ˊ+H$��`�����2r�HZZZ3f���ttt��d�a�X�t)�m���r]�ŋ��v��Y(��:�1x�`^{���6��~�)�������V���o<�$���Op�g�t�2�x�
����Jr�wr�_����6��nF���ʤ��*�D"V�^ͅ^�cqqq`1QVV�e[A
+†�\�2t�P�������bΧs���G����:مꏐO���#b$8��chkk�����JJ�@*I,�a߂�����S__�a�5���
+ZZ[H�R$�IV�Zᚚ�0M�5k�PUU0�i�L&iii!�H�z�jF��R���6��RJ��8�e���x��w�`(--������O�d)cǍ��㔔�j�*��b�|#0%>|8


TWW��y��eQVV�V[m�_,������f���岴��SRR��[o����)S�0f�b�|��'����J��9QWW���o�R�x�"��f[�����v�-��V�"�Q^^NKK+MM�!hhh��N����t:E*��K�T���d2Y��A�m���imma��v����+V�L$<dmm��)/� ���u�U�V�w�������к��x��f0�s�5��».�PUUM6�aѢ����g�w�=�c���DL�.]LuM�\���V����6�0~�6 '}�$^z�E������3�f�l�{�'c�l�R�O���b�ʕ��=p��F��
����������;�0e��Ν�����`��k��������_g�رl��6��L�6��{�9s�f��Bmm-S�N����O>��h4�!�‘GɃ>HII�׎h���+9蠃8�CB
+2D�[$�'���O>a֬Y�y晡%�װ�}"�״2�M�1�3�.�^�n��w��N�v>|�f���7g�$��fM=���L���j\W`�:;Nؑ뮽
!>d*��
����+4�ﭞ�.�o���n����9'����L�ڦr���_���?X[Z������@4d���Y_��(l,��M$R�iŋQ�k�m��0D��#����H&�m�uk3M�{�5۶1M3����rY��x�I���g�ȿ}i;s�,�H�W�p-�B�8
��#�˓��q%�D�X,���T�t���r�
+�>�nlZ�˞STTܣ�
à�����R,��!����~H�;0M�t:M"�����A��PW���C�#�C&�a�ҥ,]���>��?��ɓ���3I&��?���FZ[[�F������f���������z"�H ���MMML�0��+WRVVF}}=���TW{A&g͚�
��p���"JKK�wimmEhޚ��ю���R\�!��J�����F���`:mmmTVV2w�\�N�4
@G{;B��D$�8� ��him%�o���Z"�(�x�0@��o �J��c�����l.MEE%�)�FCc#��khnlfժUL�uB��ˑʋ�v�G
:S��[^���.�:�,n��6��x Pݬ�Fx�i�q�}�q�%��������r����k�q��7s���3m�4��>���j��$o��&�-b�ȑ���{��n�С��N�~�����dѢE��԰p�B���8�#����믿N}}=����C�9D�[v�aX�f
�{.w�yg�(_32҅~�@`�ݿ}�3���w�y睜{���4��+5��@
+@�jo���G�DL�G�'/���{,�=�<@��C���jh`^�_&�� �/Fo]B��^��s���>sm�v�~C�k}�jc0��9�6!Nڢ�1�˷^��vݿF�bb���^���}�׳����d½���\OMh�|���'��b�����1TAE7
D�]������%�G
]�V���u�n}��:D`ke0{�'��O���I��Khӟ>譬��@��4)���Wy'u������>��S"Q��[o�W^L,e�:f���X,����SR��_ʴS��I��ƓE㔗����PL^~�e<�����M��r
+�ӟ(**B)է�tcb�OBf[��r��G3s�L�?�x�ϟ�a���K��ǥ� IDAT�X�EGGG hkkc�ر�R)9�����a��F����1m�4�O��ĉ�w�}1M��>�h�d�7���}�ه��ޛc�=���/Ԩ�bs�c�=Ƶ�^K&�a����$��c��
�
o�5�
ѱ����/�5(�y��1��pW�(��ME�r��tC�u%�\zg�y�a��Bh���r��bO��VF��t_c�?c�0�]���u�q}���r��{}�i�m�~�K�����o���;�*�ˆw2H]벾}9P&�S@��w{�p�W��7Z�O8�+��Kt�c���������Y���F}�Eg�:7Bt>���}ױ?}����:�K����q]菀�����%d�M!��H�{ת|z�|��A�B�O?�˼y�1i�d�,Y������i�����Xm�F�S �綥k:�r�������?~�C/—��
x'���D�����|��eY�7�����/�Emm-�����}4������g���g����'��+���!O?�4�^{-{�77�|3o���_~9'N���ap�%����s��w��.��Y��O?�رcY�paP��A��@?_|�EHi�b��q��q�׃|��G�v�m�?~(��@�eYAP�^x�m�ن�#Gn
7s�btj��.��P*,��ҕ ��l�$e%e�<�)�իW�J	�07R��Vt֍I�Ԯwr=���]˻�fy
�S�]��]�u��Hup�����r��
+�oC�kӖ�[|�㨋hF�E $(�s������<	dQ�gkJ�랻��]w�;'�B"�i������K
k�@�a;`����'��~����)?_7l���������(�՝v�i���K�=!D�wذa8�å�^�g���y��:��Əϧ�~JMM
�D���b���I$��ɴi��m�ݘ1c�~8��;���|?��Ӽ�����K*�⮻�����gРA,Z���?����rf͚�5�\�ֲJJJX�pad����իW�b�
+����zB�bsdu]g������]ҥ��ec�
+���
���n~��
,y%��	%<�_)�t0"BH4!q\�g�엑J��-ς �!6�<�s��)�
+����X{�=�����.��?�̗wL�H��[��r����t9�3o{���\ۼ�l�J��\�=����wo������*H��{,<�q���
�@(��������o�϶m�Yו�t��L��
�3��㶣���
�z]��D�V	M4MGJ���=i�oW\qEEE=��L8
�������p�p��g0m�4�M������J�(..f���=���|�;�
`ٲe��qƎ��M�3f�x�b�D"�s�=|��̟?�!C�0s�� ����/�����<����.ď�+B���J)^�u&M���ٳCK�����i�,}�5?��@��0����K��Z@n�|��I�:\��Vz����2dX��*�!6%,�&��8.��&�=}��F.��z�м�
+�v����1K�Q�7��C:�"b��uWIt�K�&�B ��O�&]�A(
��P��g���&:���x��t�x�tB���Ն��u��oj��R��M8R`��s)0��_���{3�� �����t
+�<m��ky�2/8�aD��IG/�1�����z�4m��J�.)P�c_�>4�Y���u��M7���ѣ�*eWJ1j�(���-R�M7��?��|�X,Ɲw���7��#�<BII	�D"H�0hР~�Y^^�G}�%�\���CB�bc3��a0{�lv�y�^4T!��Ƚ<A#�$��RE��ބMa�l?�Z�Ku'���ӣ��g�y�(�!�bSŒx��
C�p�B!d7k/�e�F
\��30:Ji�f!�!q��g��m�[v��xÈ�x/[��z�#5!���1J)]]S�J�0�l�-Q�B�?C�y�����^��+ۋ
+?��^�����Zڦg[���P�r�[Q�:O�u��u~��uY"�^ǨR�n�����&�bp����C9���^{�5L��C!�N��CQ^^�駟�뺜p�	�z��.{Ŋy�[\p�!B�(dm�f�����������(L7k�,jjj>|x�h����h����u���K�>�w��dy���G�g�f���A�p,�ؔk�R^���˗s�5?	r�o��v�������\��G���Y�z�����~H���^��>L[[����<a"g�sN`)*�?��/^���+����0l�H,;KԌq�e���rL�e�s?��ev�ax���\p��73n�8�}���n�i�������oۼڼ0-d8߿^hoo���x�iJ���r3�N��g�1y��
�_��ǿ��\������o9���y^�u�N"����'���SO�l�С|��G�����B�bK��4y���?~|�����uђ���x@D�o�@�tL�$�L�:�$r=�Ў;�H,cS���s�r��&�n��i'�и��[
g��y���,�+]��ql>�܋Z~�1Gq�i�a����R��~�_�/;������>�ƦF\�z�/����[���g?��t�X�b1���
+˖.�g�AC���/�l�24%�s9�fɒE|6o�,���#�CG6��%�Bons�В(d��~H&���:>�}���˲6�x<��Y�`
����l�P��˗y�/����+�}�ݙ9sf�="��V*��3gp���µ��u]Dz,��r9t]�
��yf-��X9�q�M
m=5��ȶ��3D�M3G�ZdsY4]�F���3x��w�ǣ�`Y�`\��+�x���SOR]5����7^z���_Ț5��暟p�	'1q�]������LuU����55�����n�/�Ͽ���C1|$��MyF)AII���:�)()IRRR̼%hmm�=�ƶ-L�`۱�1�u"��ʛ�o��)�k��|���-juttl�eժUTTT{�����Q�F1s�L����1
B��Y���IAmm-/��r��q
�w�܏h�D�m�h4�eY��;�����hoG��G̬�龦id2����"D�M�h���s�h���;�BcS#[m5����HDG� 4/@}}=&L����Ɔ&z�o�2GQ"�V[m:��FKkSs�̡���I�&�b�r�S�,�b)?��r�������V�+*hnnb�U�v�3k�G�[��\.���>���ϥ��s�w.\x!���D#/ݺ�Y���"�����+cKJJ6ʞQ]]M,�0�M��-l����W_����
+
B��Y3���+ppGy$���79�����x��xꩧ���K��LMMM�t�I�{���.Ħߣ�H������D{[;�ht��k�aU����gP���0He�:c�
@GG
+�41M��㺿�m�u��P<���q�b�n�5cC�i`m�����'^��l6ͮ����?��S�eϽ��x	`t�6�/�X�&<^ӌbF"D����d������z��'���ͽ9�ͦ:t�l���rb���z+?��2;v��I��J��Od؈��j+��{/bEQ�.]�1G�_{��o�Ŋy�Hg�Av�����kC�
�����R�~v�ڔ��z^��;}a�R�����R���JV�\�Iy�P�������zܼC)ESSSp�u]�:�ƌ����M�օZ�jk֬a���A�!B����1����V����.!�f��W^�W^a���\|��<���<���~��������n�?��Cy���c�=���{��B�����:Gq�n?�i�*��U���l+�
 ��q$��򕷷7�r�rf}�.��`96��QVQ��4�ő.���R�()m�'�P�l��@:H��E�x�1ԭX�tm�|=|?�B&�σ��/�c�ҋ(��Np����K�""�2P�\|a.v�-7�)RJl�F)	�ᢔ��X(��6R:Atx�Nn>��Yn���ty��N�����&^�y�����-����N�y�|K���RA֧��
+i��k
+߻�~�����?o�C(�����=�O=��&�����d>�y0H��E���m�Ċ����{�_����
+3��Iye����~��;N�n�~{������ʒ�XYW��{�g�z�E2xP
�x�_��:\�!��N�#G*���$gu�k.~��<�`.;�<.��B�t��i�4MCW�W�O
'�~T��Ư�u�p��{��\���n�G�Y6���������:�]�P"���?��_*�}}��Y��%:�Uv��O�|����.n>)l�%��^���.��^<׵�u�q\+X�]W��"X老��������FQQ�z��]_�1�"�p�
!X�r%�ir��7SWW���Ã
1}�t��,�f��׿�5�ƍ��RJ�����>���"����ַ��m�8��9�C2�=D��AD<��q�ض���ڂ��ɵ����g���C��n�q�E������{/���'���m�}�]�=�ܰ#�p(%q�D�u4M�	ǵ1uO뮛���K��駟��SOPQQJ6�棏>��f'ww�Pܥ��
k���ɏ=�&J��$Ry�"�S�|�NÕ
+]��%���І��%�:��"�� �P��J4CC e>�{���t
)]4M�i`���a��'ȿ���zfں���u4ݻN�D^��	0C�3���(���Y����y�Dh����D>��B�5@�i���>�.�;祣�s���H׽����>s��ĭ��s�u�R.B�ah����;������j�
+�K����o^��K�0ioo�_�z��#G�����\Lc�*+��m��{}n��[�����u���R��hWI�v�vX�x1#��D(��Ϥ�TW�`�4�_~9�o�N.g��҄c�ضM6��`i�e!P䤃BQ]U�ҥˈF�Ό?��7�x�3N?#d	э��� ?��&�S^�����s��������=�HOT�D�	����}�j�m �֏vZ�%���uk��6€PxT�o�^��ݭD�q���u\�TB�4��=���/�w�@����C���_~��D�v؞q�����:H魑��0����g̨ol,$���~_��	_&L��QGE[[Gy$�L��}�{L�2%���nc���,X��W^y�W
��э;���_�v�i<��3a0�!���d2=��B8�C*��q|���L�2�G:���*V�\�N��?(����'�
0b�.�袠~>V�X�Yg���?N"�;w�e�;	BM3�]��nR�����j���_���w��Ԉa�$�Iv�y'�E&�>x�ʪ*J&�%�,A*������Ԇa����u\W��L�h4�is|�Vl�
,L3��&`F�d-�@*
M��df>���Dv>չ���e{ڠh�D*����3�˲1��QyfA�2u�0���kh��t��?
%=!��4+���5vR
+t]CJ?�Dh�����E���{'��t�M��L���S
+4������6t�B)ᵵ�	���p�v��ޙ�������p=�{����B�[���4
�q�u�u��� 
+�E�ס����	(,;K$����3|�V�^ISs+W���b�\�h4����Y�l9~�>w������v�m��aY���c�b���d29ƍ��:����E�Q_�@&��;��ʴSN����=�$�t���f����5k]t1��#���e3r��ŀ��Q��u�u��c�5��͍�Ty
��G�
+]py�w�X��WV�o~ZP0��"+Є�U ч���R���_�%F�l`D�,|P���A)��N��3�Wb�R#%<ѣ�)PZ/��k����MP\R�	D
��� �!|������gК���47����㾿�̣!C��x�R^x�*+��u�+2/�UJ��&�:R�յ/]v
+�"�訣��+������{�I�&1e�fΜ�~��O�NGG�Db�>���������?�G}4��?��t���\s
���oy����馛z�O&��;�������_������[na���4551cƌ�x[[[��n��ƅ^�W\�����^{�v���{�M��|����I&����g뱣2t0C�F7t�4�o��ʪJ$"|�����'�\���R\V�'�!e9�r�C$EI04�0@7t"�";g۠G�D"���]G
��KQ��5�NZP�*�@����w���c�]�� 5A�e)LS�i���7����(WR5p<�~t] ]0M=�B���e�y;�g`mt��[]#_�'�<�<gK�j@z���@(
���i��WO�H�5�c{��f�q]���*T�Y�=��'�(��;
+��m[��
_�i�8����f��bA�-�X�=���zc�G�������t d��4�t-�y���o�M�4IŹ������m�ݖ\.�|���0u�T�O��\�v�a���9�ē��
73#��_�s���c
S7�y�F0b�pjW��4uaR�,������bt�`���b���;�D"\����;�СCy�����6���+��c*@{��K��XK�ė�m�XK�7^��u�_�-&��-^ς�S�ދE���vP
+z��!Bֶ�qQB�H
+E5����;���!Q8�K��/*�v��A�2d(���(.)a�]w�������ǘq[�1"<9"��	�ѿ|�<|Bp�a�q��73n�8�R̝;�)S�0}�tN<�D�-[�SO=�.��үrǏϣ�>�GZ���3�
�d۽����/���_�]׹�[8��S�����Idh�6Ds����ꫯ�Q�7o�f�+ė#�7o�D�����<��3�^���w؆�v�@��:�-[��[��w�Ʋ,�m�
K�,
������<��4773n�XJK�X0��\.(�/����J��;=z4�X�x<Nm]]>����Ç�������u|c��,_���o�MÚF**��m���**+�ԅ�h�dҀ��-b��\� ��x�bƏ��U�X�p
;��3�jj��r455Q\\B4%�{��0X�x1�m3|�p:::�-���J,+Gii)���.�t���R�I&�yfK��fH&�I�R�.��q�d�ҥ�3!�mmD�Q� :�b^]����N^��i������H$hhh�0ZZZ(++���M�H�R(���b�?���˃�p��c���N�f}�ܹ�1"�6�A.��������c�������W.��0,��4��T=��R^^N.�#���:����d��蠬�����}���������+WRUU<�4���\zP�0t�…^����?
ۖ$&���3N�7�b�ҥH%I$��?�
�?�x*�+��L<�d��f�ܹL�6�H$��[oM4�"��4݋��F6�e�����׿f̘1������3q�ļ�8ASc3RB*�"�H2�|v�iy����}�9��mM&��#��7��
������Ǖ����5�}3�̺/,�5Ȟ����v~��V:�	��WD>C�
��B�����c�y�
��u=��{�z����?_�&�r�w.t��Ρ+z����6W�N硾�M�
�T�
�{_�*�
���ft���\��BӍ|��q!��%hBg�Ѕ�Y�d2\�P.�t���V&N܉0a�y晧y��s�1�1m�i6�$��RJ���!C�1�l
+)�P!���஻��u�������������O<m�}��Giiip������������C!@�[��w��G�8^RR����W_墋."�Lr�G���Ɵ��'�̙ý��Kmm-�>�n�-Æ
��/; �&�~ ��_x���V���x��0���~ƨQ#ijjb���cuC�cS���h�ںZv�mwV�Z�Խ�r��Ȥ�D�QL�@�.m���TW��,4�p�����1b��Rd�92�,E�""�(�ks��q��S3h(v.C,�q���1M�X<�t]��,��H$�&�6�l�T*EEe%��,.�rlJJJX�f
�h�ƦFӠ���x<���:���ɤ�TWW�x�b�ꙃF"h�A[{�H�d"I:�&�I�D��r�f�q1�uinn������t�~� IDAT���ijjı�D�Q*���5
)%�����
+G��b1��4���DplNj�! ����A$����t:M$AZ�#���,�qY�zU�մ4�RUUC[[���ttt�L&I�R���aYY�rH$���!���ڊ��\.G<�$�֏�t���o��ã*����{Ϟ�\IHH�1P�=��UP��x-VEk��s=O[���W� �
+x��"�s�V���(x+��VA@.A��df������f&�IB������L�����]k�k}W,F~~>_}�UP�z��,���ߡCV�^Mǎ�u���<����С�T�X,�_�d���:�>�l���{��Gzݶ���	��|�DZ@�-���zrss��sp�xl��z���\0?=_"ǵ0t3�aб�T�Q��زe��t
��v�<]'�L���C}]-�a�����@2������B9�6����w�/��y8�K�JQ\\LCC��PXXH��j<ף�����N�ڹ����������+�oڴ	���[mm-�h�ݻk�޽_~�%���444P[[��_���#jkkI��8�Kaa!
��v�S�NضM��jw�ҷo_�n݊�����ñRhF���r��b=��:.o/y����=vT��vl^�U~xɥ�\��z���i|���t�ԉ��Z����l�g��ߟd��d2Aʲ0t���>��***�ۧ/��.�X��O>�M7��:K:�eP�6m�k�nTWW�5�ˎ;���8��9�I]���򨫫#?��d2���ܹ׵�FMb�8h~V�i�X)����v�N4�$j��Aa�444`�6�uu���Rԡp�R_O�0��|�K�sq�.]�PUUEm���:�:��ω��6��� =��ӥKv��M]�ʺ�������䐛�KQq۶m����͛7���k�t�BQQ1[�Tq晧ѐ�#�Q�����ϱ��t(*����S��¦M�ٽ��������k?Ƕ�yx��
<��3�Q
��*���R'cȐ!����rB!�q�m��@�o��\�uN;�4V�\��.�_��_�����r
+���?��o~Ô)S��5j,`�ܹ��Ջ
ЧO>��3��B��vn]��Wҳ��>��C]}��P����s�2c���;b��Q[[C�N���Q_��X,FMM-9�n��&F�Hmȡi���1´�0�6*<�H��h�8�8T3F�o�d�…t�^������h��
/-�<]��7���UkB���}j�P��U
�JqW;J�/��3��>Cz���Zy �;O@�ھz?��xK�R���7~y�����c�e5�����Ep]��g�ee������x�>�{{�8`$�\'�I4M�*C��n}c�@u�L��fx\u�L�w�U���#�w��OZ
D#Q���0!8�����n�u!a�H$��N��0bx/�Z	n��h|oX6Dc�H��TkA���
3�>	V�#b�)����i$m��~	�v,
��]�
�1��s��u}]]'�Z4M3�6:~p쫯��Si'\����8۱�sc�)�_�5]�u\RV��xv�ߠ��m{���iH&��x��O2��ؖ��p�`�t�p�R��q��$�y����<�q?��0����H&0M3<�*��u]

��q=����6p�t)f��wj����w�q1��e
J���u<t�Ƴ,���W������?�yI$���X����z���ƍټy3�������$991���0M3��L�m۶Q\R�aF�mC��i�����?�g͚��t���%??�M�6���wΈD�TUm�� ͥ���h4����}~��_�J�B��h�@!��N0�T�p����4n�M��ĉ�
+h����_�O��t#D�K�,	��Z�����ӧ�^{-�d24���N$t��
�����B��'���M~A
�H���$99~W�x<�ɷN��K�������q]�D2��m_��g�PU�����8���=�}�&�W��54�#H��ը5���F��xN�ohz��#h��ط�)���v�0����d����]��]Ձ�达��yD"�@���u4��c�z�ou�i��� ��W����;N��W�Wk�^�ж��l�F׍pwR�����5�D�x�x��{�|䧂��˶�3���?�jD�14m���ӂ]^e[D�s�j�ӌ�N�J�O���F<�h�y躙�T�w��@<��Ԫ6���[u�t_��CfPA��i����À¡ϞT�(��i���h�A��8r~�H��:��;�{�e�����u�+������>���X,t�0��XԂ�鈮����
���LYD?p����D8����{��xpO���i��߭C��:����8��k�8.��&��z�œ�5L��I�蚯�P_����\J;�`�RD"�=�ix��f�D�	b����GpS6�:���|'=n�x�MD��l7p��JKql�X$�Du�J�u\WC�5�Q�v�q��1
�v���\�w
=���x�mQ\�!�긎ŢA7���sL�\�����]R�fʟ�� 7
t��u���
���/@���خ
��G ���aD��('�v�s���E�,�	p,�!bD��`��8���y�Iz��A��]�
_k%'õ����
����z�KyY�RD���qp��eӱ��-۷����yK5ee�T}]ˠ�"7��^'����6lX8n<�%7�ǭ���!G8��<��3gRPP@mm��B3�8q"����t
+�*���ָN�7d�4�����iӦ�}�ӧO.\�W\��#��
+���(�*�`�_������и���DN���9�}�0��ˮˋ^dذ�����Oz��;0��4t
-lsGк�7�<�
vP|C-jF|G��B�(-m������q<��:��|��u��RU�&2�����@�8v�ηm[�n�m[hZ����ܠ���P�>����4�;�.`��n���a۾#�А 77|_�cz�A�"���W���|4��H�R�ch�}z�v�:('so��%1C�;�=_zv��dT)�M����U�OwP��Ԛ�M�K�?=�TPN�
+��Co/i����k����i̠��w��&��u` ����+��o?0�Gq/p��f�������rb=Dz�M���
+Ư�$33Ms�Q�D���Ǩʶ
p��;�^��o;�ߕC�0��?��W�G̈/�����FOs���됓����A�4����_��SO�������zZ0�8���y���}���{�s�h`i.Q=�����D�(���|flL]#�ژf׵
WS��N��:���;����c����;u��?w�����L6��p5�}�A�E�;8�ce5�`aį����~@�0�@n0���U�5��8�0�p��Y]#��\���փ�m{.�HG�05
O���Z��D'��u�9��h��Ճy,�"�AĈ`Y~�u�=쪭�sy9c	%%�D"��.�jVpa;Z�����S�~�H	��m<��q.��r���?���>3
$8 ��޽�;３����xQ��_|�@�6O�u�����{���ОY6��1�|�z�-.��"�>7gΜPW䡇b���?���2��B�ޣ��X�|9ݻw���$�m
��&͍ď=mYV�H�w�?�L�r�q�o=%���T�h4���Ѓ�}��M��;���\��n�g�����oY�}�����q�Pcۢ9�����dzy���8��.j��Ws�g�}�y����:�T�~��y�y���]���>��czMbD�����z��yV�k�{5�o�$،s֜�{Y����_]]����9Ͷ�Ҿ���e8/�����G`��a�I~�B�?�&"��/�W�f�С�����{�QSS��ѣ1�'�|�޽{3c���n~��s뭷��Q�CII	�������|�[�ju�c��2|��&��3�`�����������_~�D"���ۿq�)��p�B>��c.�����ٳ�h�&�[彨�q�/_NYY'�pBV���Io��J��>}:7�|s�on���A8N֥�j���r(
��=��_�%<�m�a`!]��`kʍ7��ԩS)--m7[MJ�`n��v6m��믿�/���ٳ�0a�aлwo>��6o�̍7޸��d�TWW�o|��}�2`��&9� ���x�wX�xq�ǿ��+6n�����|�;r����u�]8�~��q��v�Z�~�i,X��Q����Y�f
�Ǐ?��[���zN���8��+ͧ��6���^���LӴ}����o�,� ��e�6�/��yZ(��J�T&iz�Ss|������B���hA*+��ܹs���bʔ)����k�aڴi<���X�Ř1cB����&bc�
+�^��nݺ��/f8X��G���icǎ婧�j����ﳥ],��[�(�y晌3�ɓ'ӱcG�-[F4e�ȑ̝;����|ƍ'M��RVWi��[��k.�PS�ޔ��s��Vg��׏��/�plӸ4��c�k_l��;(qe�CӃn�Z�VIs�F���Ց��v~��q��ٳٺu+o��6`��
�����?�Q��^?r0C��/�d�ȑ̛7/l�#m�п��;,[�,c����cǎ��u��K���)�����͜9s�|�o̹�Kii)�ƍ��/��_�~���_^^�9۷og�ĉr�!�Z)��6f�N��֟���ߩ@Bqqq��/M�����F�fH@\��D�U0Z��eg������Hm�OxͰ9�a�b�X�3�$p������J�x�	��n{�1***(//�7�������:�s�=�h4�l��/�����]�Vj�V9����z�����۩��g�ԩ���Q__�ҥK>|8���qU���]w]�&�6b͚5��уSN9��^z�x�
PPP�����p<~��dРAr�!�9��<�<�L,�
+w�U�csמ��J�.**j��w�����o�.]�0�NA8����O�D"TVV���u��x�k�N�+��W�%�T׮]���	�	�#MD�PuM�����K/�DNN�
�X��=��c�5����(?�p���}�vR����\{��\~��\z饘��رc:t(+V�`�̙$�In��|�}�C�(-��m����w[��ځ�N�<���-���=�ܓ�V��v6w��q����+t�ԩ�u�� ���|�i����˲���Y�A���h�}�)}����hҝ$.��R�z�P+�=�
p�r�S�q���sꩧ�j�*qj�sG_������޽�-[��H$2w]7�D
_�bڴi|��'�w�y̝;�	&0x�`���ϪU��0a��ַx�7��_}��������r�u]'�J�D������Ț�R�T�Q�x}k�{�t�
+�{}�uF�����}6���m��b��jj@�w�[.,�ׯ�����;�[��cԍ�j�*
ĢE���͕E�q����o�"�s뭷6�;��Vs��3�<����ݻs�'2s�L***�4�-[�~�ӽ����_�w��]�|�M���p�Kj�ihh �LRRRТ ���.:t`���Z��l����L �z�� � �Lf���צ��S����;��S1���/�tfe4����8���_v@�0v��ɂ����I)�6��mhh����g�VY��r�ʬ����/f���x�Gnn.������\v�e2�aÆ����m�Y�]	�pt�xz���9餓(++k���yX�E,#�Lb�f�(��I�1�M��]����!//O.�p��:i�,�vmJ�?��y�ל3�<�M>Ӻu�p]�q$ 4�&޸q#�ƍc������?fҤIL�:�0h� ~������s�W�y/��M���3�8�%K�����/�|�����CN|;o���a�J�0�g�}������O?=l��:���L&�T�Ƹ�K���[d�g˘1c=z4�T��˗ӱcGf͚����y��
x�G1b�a�ꫯ���c|.�u�q����4��qo隧��S���W��1��k:u�$:8� Ǚ�m֗ZgT'����y�W���a�
ʫ��������ˣ�� �!Y�~='�x";w�d�������ٳ��'2o޼C����ٰa6l��7�k�+**(++���F�[����gto�<�4Y�~=�X�����|~��p��'����]�z5��_�8q����q=A��	
�U�VѥK�v��b#G��+�-]t)=���yE��G?��g�&����p8�LY�����ǩ���4ͬ˾T&Zz[۶���x{dI�Q�X\p��Z��9s�t�R�|�I��˙>}z�(QTTĺu��{<�z��<x0�v�E���b����Y����˖-�h2���mۚ�~̘1<��c��ӇΝ;s�E�u�V�~�i�ϟ��ѣٸq#��r��zj�!|$�q=A��3�����-��O�iQs��/�̰a�Z<���Y�%s�pD��r
+¡A�����uK�jMM
:th�x=���ży��裏�����߿?W]u�D�ɓ'0r�H>��s�{ｰ�`A�y����SOSN;�U���^�i�z��O�>�~��_b�6�ee����X�~=k׮�������S��4Ml�fҤI|��,Z�������Z>��c�}�Y,XN^��#‘6��('��F��iἷhѢV�}����s��F1C�RA�c���
+�u���^���u�իW�y�t
�EUUO<���{/�m�r�J������Jy���8���D",Z��YV׮]y���4h�z�:&�%���g���7y~ٲeMҀ
+
+
+8p`��]�vQ__@�7��՘_��WTTTЫW/�}�]z���y�[��Ν;�x�bx�
|�A�n�ʄ	�֭�A��97ݨQ���g3_��\7l'�ZCIe'(]�uA8���㭚�U�Zzk�֮�W��N '''�26	�x�����?~|�c�sk׮
�D"����_VN��y<���<��3�]��/��1����V�\��i�w�ya�;�"=s�L�lْL�R�ر#��h�s��#��t�R��8�>�,EEE�9�d2�ܹs)))	K����0�)ƫ G�J�ee�Q��86�^{wJZ;�E�Q4M#�Jeh�� �*��0��CJ�V�[��ɓy衇�.Y��	@G�M|��Zꤪ�\y啌7�~���>���&8�ѻwo,�"??���\ץ���!C�PSS�;�C,�o�S�N����^{T��ܷU��;�����/��/������?��/��F)���<�������ҹTj���Ӫ�}eڶ�aa	�̧� �.-�eO�Dkh-����m{ 
᠆֬Y�x��(++cĈ��8:��ӛ�h�4�����$�Lf<�8�T��/�˲�ѣ?�0#F���G%�Hp�W��?���K���[o�p�B�{�=�~�
�l
b�
+�p$�ʡ�F����������q��w^������a���s��W���٪B� Gj׾�;��h�J3������Z
+%@h;#�����\^{���p�
8�խS�UUUM߰a�w^�����b6nܘ�g6l�\r	.�'?�	���?�Z�O>�����~�m�O�Ο��g�aA��'�It]�_�~a�?��Ғ ��M�ڬ-������ѣ�ܹs��_A;w��0���,�Ee_��i�v�j�ϴc�rss��#B�acǎ�������
+���:t]��GE�46n��m���i�����߾OG������=ݺucԨQ�������w�eʔ)M�/++����o"�TTT�ю�9���Ȋ+��8묳x�:t(_|�uuu|���ছn��.�/���,� mL,˘�����֏}�Z�]����:VK�޽{�ǐA�c����
+�0(((hq��a�R)rss��WK�h�,4	L�<�����|�����?����9˲�<y2w�u�����ٳ���;Y�l���7��h���?e„	�s�9ض��i��������0cƌ�oׁ�P�?7�|3�����у+V�J�8p ���l�2fΜ�K/��eY<���V	�IDATs�u�Yr�� �-��պ��zFG��h
+-*KA�.T Y��Ae���K,k�����ނV���1�m�|��GL�0�_��\��lذ
�w>֬YC�=شi�~�)+W��K.	�v�ԩl޼���J�L�’%K8��5jC��.��+[�l����o���V���AAh�<| g?�9X�]�ݒ��_F���Bp�l�}�E1{�lJKKC�PA8�X�j�h�������Z4�ׯ����՟i̘1<�������<�%H��8 �J1`�~��_1s�L�u��1w����;~jLzJKCC��0k�,�L�B*�bΜ9x�Gǎ�馛����ihh��n`̘1�}�)�A8�
�uq�+V�e���$�붨}��i���������xxxA`@
+����H$���i��N� ‘�r�[�
�2�t]����Mv����I&�x��m��r��8��g�a�…h���_L߾}�ꪫp]�{�������|��TUU���.�fߺu+���oX�n�>�h(�WXX��ya�nn.�������tA	�bI���a�d�n~�����H$�q|O� mgF=���x؂I2�A�mT)Y��_-m�~0~���QXX����
@lj
6n�8ƍ�����?��5�����ٳg�i�_~9�H�q2n���B����ٳg��2� G��cF�藔����O2�l��rpT4M����h�>Luuu�@� �p����M��W��-���{n�Yګ2_�8�M�߳g�Ǐ�s�Δ����:�T�;��|.��n��6�v��]w�%']h�D����w�ҟO|���	¡_{�8�4�D"�eY�Ѣ����^�=&�Jq����_��_�/���o6FT��݉D""(�p؞-u��mL�n�{u\�q�D�{.
���Ofܠ��{o�kN:�$�Ν+ΕЬ	���?g��ѬZ�*+�\�4�~�m���4i~�!S�N�����z��.��?��O��֛H$2��k�.^x�Ǝ+C�1PPP@4ŶmL����j4O���|��F�I�$�q�S��
"''G�/A�c�t���ڱj]S�Y[9��mn5��6���5��{����?�
ӦMcƌ�{�<��sh��Ν;���͢E�B'������:t(�W�&�J
�dɒ0Z�~著g͚Ō3�<y2EEE|��',_�\.� bT�����ٳ���z��h(��2�E�虜aD�]��Ӂ�)��F�\��ay�d
� �t�҅���VR��a�x��V;�\�
���k
��N�veȐ!\u�U�z�\q��v�m\~��|�嗬_��[n��+����˗�lٲ��R���bY�sw�}7��W\qE�W��k�����_s��W7�b��Q����a�&�X,4x�T&���SҫW��c/j�³
+$�r6%P(� ����P\\��iX�բ��b;�Z��i�����eY$��vӢ�A�]�1�=zPRRŒ3���gǎlݺ�_|�9s�0j�(�|�͌I�����:t(s�̡cǎ�?�ŋ��k�q�5��D���H$ƒ>�o�[�����͛�B�!$=�^�Jڶ�л��a�6��2?���8g8�a	�2���9��Z�ZA8��,]�[���:Ш���([�fMx�q�% � �dW^^�ĉ;v,����S�Nl߾�Gy$cr�4���Z4M����I�&���fsȐ!<���̚5�x<���ӹ��K���
'�Ν;��C<����8�d2T�WA��
+���xخ_Z�m۶�;�x��4w'_�\f�A�^L�lq�W9��mgtEk
�����,h$@�v�{��p�e�
0�|n��z��ɤI�X�d	��z+g�qF�D�F��b���駟΅^��{�
+%���g��}�v^~�e�����͛�0a�\A8Ĩ.��QQQ�i���F�-����m�h4J"�ࢋ.
+
8�����)��/�p�����]�%��L&��3�H$���m�5I��M��āR��l�����?~|����?O׮]9묳�c_m������z����gr���wc�_��g���nt5V�O�P��_Ah�uM	��U�ؤI����;���h(
A��`Akk��՗ ����>vU0 �L����%�;���d�_��Ah��z(��q�&���?�D�x<�U[	� �pD:���U�l�;V㌂�2��hƶ�p�Q������u]k�:���5^��c��� � mNc#�-�%��gU�F��#�3A�n]k����%� � �L�#���% ;�c�Q�Ë��AA8��uC
qd��cG��)
A�F	1���t1@	� �AA8�IO��eA�	�	�񉬖� � �
���AA80�)2̤u�-IEND�B`�
\ No newline at end of file
diff -Naur ns-3.22/src/spectrum/doc/spectrum-tv-cofdm.png ns-3.23/src/spectrum/doc/spectrum-tv-cofdm.png
--- ns-3.22/src/spectrum/doc/spectrum-tv-cofdm.png	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/doc/spectrum-tv-cofdm.png	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,409 @@
+�PNG
+
+
IHDR
\Vį
sRGB���bKGD�������	pHYs��
�+tIME�+�Ԓ IDATx��gxTE�߻-� �;" DP�(��E�O)"`E���
��(U�FD�(�� �A�MZ萞l����dɦ.�r�&�}�}`�wg���{fι3gM�4AAAA(�D� � � � 
AAAA$ � � � �AAAA�� � � � AAAA� �#'�
+� � ��IT Biq�E��5#g��@��������w�
+� � ~����,AJ	I?�X��8���I��I̦ � � 
A���i<���L�%��մC��3"��90X@+�oS��4�YRAA�@q:
�:� /{_�~�|��
�z�`#V��f���%v*� � �~�@Q�ϟϘ1ch֬��?			���[���ѫW/n��6iUA��֓8�,���v�������g��u�9�^a{�7���-CAA���߶2�իW���̡C�x��G��￱Z��ٳ����
�Z% ����7}ۙ��Կo%���jCs�_��QJ�N!躏�T&LAA��f��e�����;x�7HLL�aÆ|���T�T�3g�p�M7�a�/���DϞ=�Z�X�V.\(=B��=+��QSw���a��{ �'}������V� � �P\��
+���TU�G�,Z��
60z�h4Mcɒ%�]��w�y�xU^hh()))2��Z���b��b5Mu���8!�.Ml� � ����
+���@�̙àA�g��Ť��2`�"##�v��v�d/x��yq����sP�HO�8�;�c?�]�O�{q�0)$.T��K
+� � ~0�-���@�%q��b	ȧ#:�T�8�W.�	X�e� � W5~w
+�/�J�o��]s\ c�X�V�k����U�8���% � � H@.���Om=��}#�/�������s�2Y�-\�
+8���
+�����}>�{@�AA����v���-Ňj;��ȧ@)�
2v
��
+>O^��)ES5":K`H(Ѯ?���(p뭷P�\y�̙�qűc�ѳ��X�v͛7eƌ��U��
A�*@V�7���<��]�����r��N
+(fѷ�?�
+؎|���c�����(v^�M��s
�<�H�+��oD�V�q:��4���}���_D}� � 
�jp�
2v?���������^yEΓJ'��$ �XV�^�w��l6�ij���}9���|���4
�lى�8t�?�W�&JA	Eq�];8�|m#I�ќ�KX��^yA(M(
+8N�!�J,�[�JZ�
�2e���|۶�S�^��K�q�|��TF�|�P� � �4��c�áPH�1���5j�N��le�_	���E!q�BD'� \������=�z�M��+��oğ��s�[�p!�W��!ǐ!C�Z��A��E!99��z��۷3a�ڴiõ�^��i�ر����b@����<�8��k��.��^K'{��q�� �KZZ�jU祗�g���2�Q>�lZ��u��I��"&��8�SU
�==�듓����s�lܸqh����Z�f6�1.
�v�U�\
g00�/
���͊�b��f��=r@��R���)�EQ�X,��͖o9����2����nϷ��~��h��t��s88��˖�d2a4�m��rTUEQ�\���N�3׾����ZNn2e/'�v�oeo������e41�.M�s��r�����W9Yeϯo�l6�����.Sa�����CA2y{_yc+
+��mo�ValE^�U��*�=~9��w
+kk�D;��e;d����76�D�{�9ڶmKݺu���;�ݻ7�/�`0��#�0{�l�������`�ft2v>���
���~�.���D�(��i�]���ti�k4	fΜ�ddd����;F��$'']�?**���Y�a��E*�\S5��R�^=v�ޝ����h�F�޽�Y����o����G�z\_�re~�a��ѣG�1�>|8����}��Gh��/���q�HNN��^�(w̘1^ʓ�����o��q�رc=����`�}�Y�`�����ԩS?~���绯���9~��G�U�V�o߾������h����2e�Pv�ؑf͚��?k֬aժU�%��i��уk�����9s�p��
����tƎ�#$$��s�z����੧�ro%ٿ?�f���n�3f̘|��j�zȽa�Z�h�{�Gzz��yx�<�|뭷�tM��իu��q_3k�,:�Qwll,���w�?z�(_~�%�v�"&&���(�y�"""��L�0���T�r����ܹ������Y�|��Lo���w�~�m��izz:���6�|�w<���퐗��N'��|��>|��3g�ڷ�}'�}լY3��N��������=�S4r�H�>��ox8\ݺu�aÆ;v���s�M7y������i�СDGG����_����QN�
��{���y�^}�UƍGZZV��ѣG{8`��nmĈ��.Sn퐩ϓ'O���H�֭4h���'N0e��6��/&N�HRR�G��_�G@u�������9|�ӧO������>t�ԉn���~������?�DDD��O����2`����ʗ/υ�6mgΜɷ�g�[6���_~�C�����#�(
+�F���N�V�<t��.\Ȏ;<�.S�C�u�?{�,�}��G�n'�L�BRR#F�����'55�z��ѣG�5;v�`��u9�N�qfܸq9��v-Z�p����_ٸq�[�5kְr������@�Պ�i�k׎A��ԩS9|�0۶m�f͚�P~���r��i����*~}���E&��A( �h����
@�}��{�Á���h4�pة[�/���?�Æ
d޼�?~��{��f�Z̟?�nݺ�w�)S��ݻ3e�����g2d�{,����j��^`��
yʓ�޽{���ߺ?��ɔ�S�+Ů]�8t��:u�1X��ӵk�b0h޼y��qѢEԮ]��u��VgBB3g�t� 88���4��;z�(��'����J�
�������C���#O<�;�U�T�ȑ#��������nuFEEq��y��;�<��=�?�x��o�O���ߙ0aeʔ�U�V�hтÇӲeK������iٲ���%%%�t:�/M��0�����'����P�������E�ϝ�~��&MD�����1�^�z�d���Ν]O�i��[�~=��G�tֲ���aAA|��l
�ر#;v�g��aÆ��vv�څ�(4n�M�زe��S�\&��M�40(X�!�Z�0� x������D��	��R�¾}{���x����Ͽdd$�c�cf@;s�qPP={��j�b��NE�
�[мj�t�ޙ���_}�@U��ӧ?�=��"�	�?S����4�XZ���XB��59�ll߾��_N�E!u�t�@PuA���q���-G�	>�/>%$$���?A�4�8xp/�*U�2n���r�s~8�'����������]Ĵi_���ߡ(*3fL��{�/S��Z_ll,aaa��9}�t]�U��������_=�������߮k��&Mҵ���(]��L�6M��*V��둪W�޽{�Z�����unM&�v��k��~�������Ю]����Zi��Bhh()))^]{p��1T���&[
A�C0�w���"��*]�v�`p�`�2��SRR�V�cƼ��
��8z�T�	�'�o���GR��%�3�c)!�7��ՋY�f��A��SSQ��(&H�	��Bo�%��
��7��A�h���F��A9�YpM���q�72e�$T�����:��=ݕ�� � H�������U� ���M�

+>r�
T�^��K�p�����'O�-�'��0�h/�v��\ 2������.��t�(
�B`;)[A�E��M�ɤT�	�=JFFs�΁W�g��՚�q��*
�u�}��֭�{�n^�P��S�=z�_�رcl޼YW��^]eܽ{7{���U��ݻ�*�ƍ9~����555�%K����������ٳ�^�ZW��>]e<r�[�n�����DQ��^�v;�g��Uƾ}��*cJJ
+?��s��/iy��|2���L�
+�?	���@��_��,�
+��i\{mC^}�Uz�x��U��̙Dbb�ѤI#�Fאn6�8z�t��H@��A�1v�{��2�ϟ�k}��ɜ<y�D�x��y}�5͛7O��N�<�{2G��΁t�s���֗��αc�t���Ե���$N�>���۶m����Q-���{�n]�\�h����l6<(
�+��1�<�V�� a
��4��H�]7P�8�c��Q�!
+EQ�4��^{��}����I��7r��~bb�
��3/гgŐ%x�R�JUbc+��/� ��;��I�Ϗ
4[������r
V��� xa�T;�č��Q�5j�p���k/�W�RU*U�Z`� � �>�*@�套^�k׮�[��={�G۶mY�p��k�8�� xk� m�W0@r
� � ŀ�m
x��i֬=��*U⭷��^�]�v���i��|WQ@Mg:��#	�P0�@��_#o�(��C���9p�F����X,�h4r�5�!J�c�ի�k}�����-cPP��9��144�E��F#eʔѵ�:u��Z��l�=�Bݺuu�/  ���`�m]���u��f͚�֧(
+��Ѻ�Y�vm��
�����:��۷�C�$$$`2��R�Jlٲ���H^y��;����G!edd�P��K
�o
p�6({���[�k"��?B�x���~>��c��~;���̘1��L�6m�c�Ptz��ŬY��㿞󌒜AdD��w��O��U:��d-�3�<ìY�p8�߿��� jԨ����P�����۷ϫ�BBBHMM��������osa�|��kT��:� x����5�������(F_
�ԩS���)k��ߟݻw�ʕ+1b����,_��jժIc�i@AJ~�@�4Ə����9~�8��z+���d�6n�ȨQ�P岎��mҝ}��b����B�2O��i[�'��lQ�x��8��MYG����?s��w�NJ��ŋ3w�\7n��l�aÆlٲp-Ż��Y�n�4������ �$�)��(��Q:e�*��t��
�̎�i+Vd�����4h@�.]��c(p&�1���,ڷ9@���v�ku�Ŝ)8�Y;
�j����Z�,&\�]�N�����dN'���P]
M�
T�R�6�g�C�NU�
+��lƅ5h�c�(��T��[���}�a��cL����֭Çg�����ٓ.]��ꫯ�v�Z��.i�'Ž�S/���_8@׮]u��`0�.�U�0��lٲ��8o�<�իG���u��…L�2������fŊ<���%V�m۶q��1:w��߿?S�Lѭ���p���t��j�2z�hƎ[b�ιs�1cO?�t�l��
о�������v���8M�мw M�င$Mz���h�_��{+4�ȽC�q��ξ��GP
+�[�AD��,4�D�ށt{�:S'�!$~�&�/~Š@����4��w��]\<7��,>��	?�c�l�l�h���8���i�(��8@���Y�S�Ν��b�]�v�5��b6��С#G��v�s�F�������S�ɤ�^��b��.��(�<
+�7��`   @l�@�ă����˨���wRNEQ�t��)z�i��2nJ4��A�&�n�w��qwkXw*��O�lKd�T
�!�{G*��
+�A�fg��f���I��-�}͖�ϲz�� Ue�
'�`�.�mN�dx��Cl�]��������A���a@'O(h��s�0���`2�_[,�L�:ml�Jk%���N�_o��v���N�W�X��;3M�6u�7���AA�vd�T^�sE�’�[Z����xJ~�:��0k<�"��C�����m�p-�OK�Fqv��j�t1����@u�෍&~Z��͑�l���.�,���`�!��3Ԉ��Ϡ(��A

+dnc� 2Te߶@�~ɐN���R�		���L�m�*��ԋA�4��SA����s��HL���*Eq9��A��9��h���`�d�0�s�Y�$x��F�w3h�[���tV�+�`\���h��_'a�Ԩ�[3(��T'T�t�W���
���/�8���p\�i)����g�]��lr��[���||�����S���
�I�ќ�(�QHaN��}��eÝCE(]d�[��4T�d/�SU��8�Ng��V�w�Z���z�X6@�:
G��;�EƢ�q�|=�7�5ދFS�'`����;	�Z�߸hV���',9j
LF�M�-����	4�3)�А��)�3	&2�A6�
+���?�@�� �%�O�]�J�F����f0sj$-Z�0���s�6ӕ��_O�b�cgќ�j�P>\N:_O�ӎ���\E}�@��:K+{��յ�Z�jѶm�-�
7�@�&MJ����~;5j�еΰ�0ݒ�e�g�]닍��-Afq��:u�p�-��n�^{�5]������“O>�k�۷o׵���|��B_V�MGX��]PD��
�򫗿~��/��y.��$�Z!<P��C
��P����4��a�X'/���M?+�l��	fnk�t����Ƶ�3�Tk�b4��q6�sR���
+
�55b]��i���\�iƮ�,=�C�����w�c�层�S$/o*��dxqm{�IDF�YZ�]���T��R�e�;q\q����-�Ѩ{b�Z�j�Z��l�=A��}'  @�D��ʕӵ��ի�;�Rʖ-�k�5k��+�hZ���JJJJ���x��c�h��.��I���5
P\K��ґ|&㥇�YW
+��0��h�<�D��6�E��q�c���[��
�u�G�)ʥ�5�u���������۰"�c������;	i�T�Q@თ}S�����cw��A[L��ՋY�f]�7dٙ � ��[
�v�ZN�>��d�b�СC�.]��it���g���]�R��@����� ��@AV'_Q.�Ȏ�
cF��ns9��r�ų��r��-���zbA�+�ڬ�Qx�Nv�� x�����M��b�U��fg�o�R��ڸ�؇.��)ɫpDFA�*}Go���\��]��u�r�M7a��X�nS�La۶m�ܹ�	&����_ލ��r�'���`͸�_i�q��J��%yY�LZe/�d*��5��JK]R�T�����o�>~��w]e�X���2nܸ�͛7�h�/_΁t��IIIL�6MW�֬YSW������?�*c�ʕu�q��ݬ\�Rw[���/�Z_�f�tի�f�>�U�����*cBB_}�U����9�FTʖ-KFF�-bڴi��Ź��
2t�P��4��̙3���T��-����ύGZ�^M�y����Jo�N��T�fQ���[;8�|S��
��NK#�����p8���(�2�l6C��1##C��㪪��zq��	]�s:�����hG�d�OLLԵ�S�N��7&''�Z�ɓ'���E@Q������矉���G
\	f2����d3���]�r��wg�ʆ�����$l�(
+d�����PO��	2v%��&Q�e����*A�3�	EA�}Yv�SY��	� �P���
+�I�&1i�$:u�Č31b/�����#G^V�������>�[ؽ�j�ZU��m���_!�v�s
�P�q^،3i;����L^F�W���e�EaӦML�:��I���1�L6���ԩS�_��8��ªU���	
+
+�i�i׮=�L�� � +~� �$���#::�.]�0j�(^z�%��j
+��`B�S���	� d�SV_/����j#�/�L�+(��K� �r黁���_z�%���Y�j͚5����_~a�ҥ�1��M�� IDATԷ��(�;�6m�q��)�n��m�u��OƣiҟA᪘7�㏎������8��FB���n'Z!φVH�ѝ�si� BV��9�q�7Lѷ�B�`�r8�e�a��й�w�ML�
�!��q�I�0�]�k.\ȡC�زeo���{���n������ǫ���s�9�����駟஻f��1l�3W��~���Z_dd$�+Wֵ�G}T��ʕ+�k�+�䩧��U����繚�J���n�I�:�ͱ�+*T����_�k�O<��U�R����+^Ov�{�����ի����F�4i�k�}��ѵ���������5�Rz�nhh()))y~>��0�6T��֏O�Y����;I.A.c�lN���"�``�w����p��2��������t4Mc̘1t��EQ�0aժU�[�n$''�a�^z�R�3fL㡇EӜ����?66�ɓ?�K����,Κ5�=q�9�JgV��a�N�g�37�Jb��<
�1�"#�i���()�#	�L(t)3�[�-A	�
+�P0���p���\[�8�R�UZ9�ʥ���o��6�>�,������0|�po��v�o����b����K���&,\�0�@n&�٬�h�7��{���Q�  ���R�z	B��
���[F	Ԩ�ͳ{Ӣ�g(�"<�P��$�
+��%FHYQ��.�@�@�
��N��2��Y\�������w�}7_g�4q��i�U��c"T�ld��+��СC�:u��o6[�K�����<���ϓ|sMA����Z�����:/��*
+�l)�K�{�,��6�c��bG�ls�����fUn	xIҾ����s�4F���^�%���p�l�`ŵO�~f)明��|GF߭@#OG��6+݆]UUL&c��J��gdd0{�l22r��8�ݎ��<���4h����cDzo�>��kժ�>HQz��Ahh�Gp��O?%22�}͐!Cp8L�4��{���fΜ�Ѯ={�$88�����4�6��k����z!44�O>�������6���~φ
�e����<x�C��u���/��o۶����{쭷Z�|����r�C��z���;�to��?>?�������TfϞ�!S�޽ݿ7s�9t�P�6m��������͵�U�V�رc			
��ԩ4W%;� ��c�=���(
+aaa|��G(��C=�#OG߾}i۶���I�&��_�[����
��l���d���T�^���9r$����k���ݫ�2˹���]�"�1}�t�������3�����=�aݺu�2d�K��0q�D֯_�QFLL�GP�����⋘�lU�^΋/�ȹs�2e
+�&==�n��#gƚ5k�<y����p��EQx��GQUωL�=�ԩ����3g����y�f���S�9������+�8��l�k�4	���λ��1"Z��@-�P��P!�֝C�e�A��
+o?웲��Ӎ�qW��w|��>����T�e˖t�ؖQ����{N��=�1<���	V^S�+��d2�z�صk��cǎ�=M���}���ڵk14o�%+g�z(���
+�P����'���uY
�d�G����d�y�^y�������QQQ�?��6;��Ο?�����������o�8{tD2�z�fEzr�(�:��&�HoGnPLah�D

+���<�,45jT��pp��	Gs�ڵ��w@�ш�l�l6c4����r�c��(�����^_�s9���A(^֬YSd�Rl�����6�׶������P*V�HTT6l`ԨQ�)S�
\����llNQ�Khp���|�[+��Keŀ&�#WT;��{	��k�{1�L�qi	��
�^�:u�6�qO���D	�~�@UU���aÆѬY3�}�Y
D۶m�>�5�������W랇��ڔ*M7�9FP i���� B�6�B��f��� 
+�ՠ���+y@y)��?��}��������%�������E���{J��/��%�Á�h�C�"���u�/))Iw��+s�HLL�wڣi^%�-
UUݎ��o�ɀ
h߾=�F����T�R�k�-x�lxxx��HAO�F'Ƕ�@�7R�y�1.�!�A���U�an;%�ks ��rJ)-Z� --�ݻ�Nll��yt��;L��/��
���To���)�*�u�'Oֵ���]�N@@cǎ�UF�ө��e˖婧�*���j�k���3�<����ڵ�F�y8��۷'-ͻ
�III���i^�P��⊼�Qu�3U� ��8���m}���m�u�j��K��>�B���z��������[R�檐QVB��
���[F�
+�3��>��Э[7��###���aѢE�����o��or�V�#���$� �3��v�QD�ד{���J�M��ѐs|�x����Ν�A	\�k����s?�衇8s�_��.�������1e���`���� xi7̐�w;QDv�[u����+��.�c˄	x��ٳg��f�С�_�^Vg�s�8�ICz�)[��(�� \�Nlk����
+W�X&\�J���sdC����
+ד=Aop�^��vH�6{��x>�w�yo^8ɹ ^~�ej׮�3�<Cll,�'O�O�>|��'�x��&%`>��J@߰s�N-Z����`�]�?������K:� \E����׵�
+*�jw�V+�����2����*����0aB��o�[���V�����u�b��� ���!c�s�ɱ>�,�	�$S��:���w�M̀���b 69^�+Kl!KR������`���+�t�BFF��7'N�{��<����<��7]og�X��ŠCV4`
�R�� �Bj�g�1�I_��b��x{^2e��@�n�}�N�:�QLE8��Z�ٕ@!_�c��y'���kal�K����
�
0��K[����NO'�{��̟?��� ֬Y��(4nܘ�۷�'M�6�� xc�+t1`	�i $99���0��q8]�9��a��uu:���	�m����8�N�fs��13s�����d�.��|��r�� 
_
a�t�}9�փ'�m4TL��e� ^�3�m�Dp�%��n��"$UM�^�F�E%�D��\�-�n�J׮]Q��'���q�F?~�4� xI[ 
X4;|�re���>*������oԭ[�J�*�t�6mԭΐ�]�:?�<+W��{���)2�t�����?~�֭[���^���Y�k ο 
�
k��k��hr�:)�V�ί�țE�� x���X��q%�b��55��}�]�3�3�hܸ1K�.u���sy���DEE�Z��h���&@�2e��d�L�>����d�nG��AFF��uf_ҭ����֗���{R5���Պ�n�}���x����֧(
+AAA%��0^GZ)�ZJJJJ��}��"(ƻ��4K���߹BlE���Ł9A�l�)�B��\�u�`�1}S֡���2���A:Y1ѫW/f͚u��k:�O��MI�\2�\	mڸ���>L�*U��>�>Ean�	C69E��[F��*���{���}D^Q �\���Я(Ug�(jbAAJ>����D�����(���t�O�ǿ"��(H�)�r�^K��T��ŋ�ԩ{���_�~<���Ŧ|��ξ��a
+(�\H�
+�]�A(�n� �04{b�փ�t�P��K��
+� �P��KW�'�`ɒ%t�ޝѣGөS'�u����Ë6�,�RC�Q�́��Ґ��VTL`;�� ���ݲ��i69��g
+�V�?�k}v�]���ǎӵ>�Պ�f+�2���_�}����j��XK���p8H+JvW?�;�at��ĉ�㚦k"P���x��
~�>�}�G�Z�*��������[�n���^��-��B�-hѢqqqE^=prgCE<vҙj�\^�0B��{���J�Ϯ�f��KV�Z����w�^�/_�k��+Wֵ�
6�q��-�/��t�3))�ɓ'���#>>�}KI�;�v�bŊ�ۺ#F�Z_�F�t��f�1n�8]�Y����%$$0mڴB�/r(��СC�1c�V����?g�ƍt�Ё5j�����(T��$2����Z�*G4���*
+��/�5%Kpz�e5���s�6� B���ya
i��|Â�pR��X��~p:�r�OQ1��֧����Ai��h4��S_�_zgUWEw���Vg�cz�>�w�)
�GQe��&L ))�ƍӱcGz��A�~�����ҥ�;w��O?�,ÒۍX���X�<���"��\� \�d�U��w�k|��G֯_M��m����� � 0u�<Q<}V���e鴚��X��z�j�ϋ/���*�Z��uw�^S`?�Z�*�� �`��K̕`*Ӣ�ɮ9��mƪ���`۶�t�܍�`��'�%&&�����`lA��;D�~y
+@Q>׃�[o(z.�dP3$� ^�F3��j�v�JWP}��%7'�`���5M�E��=z�}����gٺu+�+W������IM��ee@>�ө{}z'���Á�Q�k�l6����i�'�KOO׵>UU�Z�%��$�=��t�Q���������P�R:

�3{���	)��g���/	O.RFig:��-�A�S�7�]�d��0�fߔu8	��qםr|����s�N���([�,�gϦM�6(��ʕ+�P�B��A�<�OK��رo���
h��F>��c5j��`��W��ՋY�f����]Qr
]�\2�\	mڸ���>L����T��h0dŋ��Z����Y����0~|�qB�Zze�]�Wbn��evo�-c�!Rw��/��8�,As��*�a��
+0�
+�z�R��n��\���1s�L6m�D\\�V���d͚5���<����:��
+�'��k�����|��ԪU�?|��m�ל�C��c��:)�	�J����I��#2�/��t�(i��LWEÑ�5�f!:�3'x�gЖ�3q��mK��3�a��K��Ղ�^>P�`�6+!��-��y��={�p��95j��Çy��1�޽������_l�$��'��O?���눎.�m���{�Iǎ]��
���W`�ĉr�� B)EY'Ι�b|����_��m�[j�wg
+$���րS�H��Q����wk�fl�huӥ�����w˘`e�K�'�-����?��C
йsgv��IJJ
+��v[�ɿz�o��C�����?�J��DE���p��3��M���_���f�&2
+r�N��	���+�XǬgE�2�	(ꃲ�i���Ӂ�,E+GM5U�G/�ҷ�)5�`U
��K/���z��e��#�@kݺuiѢf��ݻwS��k{פI�>|8o��o��v��߼ys�1a�d7n�v�
�v�O� 6�"���$�c�WE��ۿ��˂���]������V���?�,�2Λ7��;w��_/\��{�W��Ç��_�h�m���ŋu�u���׵���p]�j�Z1bD��;�Ν�>����D�)q_�.�j�CE��� u�f�A�
��9hδR!�������ˑ�������E���O?y�M��Եw�^|4��֬Y���ނ�n���91���g6�K�NM&&S�^lj�Xt�;���k�AAA��g0pֵ���H�eԻ��)SFwP���/��c�ؽ{77��Z�v�Z�f3u�֥bŊW��TSH:y
���)�`?�4Wb@��	�P��q�p��s�N%_V�wG��WNV�97'ZO�ZQ����ﾛʼn�ٿ�z݋�e(lذ
U5��Ʉ+'�����l��L(���a���%�� � \E��
+�{ｗk���=z0s�L�����		��~��h�����"NP���	f鴂 xa{���wg�SV�QAs���/Q�L!!!�L&"##<^�jՒ
6b4�n�P9r�??<W�����\�
+*T�_����v x�
��A���VDGG��O?Q�fM�������7n3f���n�Np�������d�N'��{�c	Jc�����?���.�
+�$0K���a��u�|�
+J�"���1�S��t�ԝ;�0{�\F�~��q�0�����4v���;���?�m�R�ڵ+����O?��#����&O�~Q�Wo?l߾������]�e���̳�)���a�١C]e�����
��l�J�*�֩w����@*T��k���~������R�lY�m]�z�t��[nѵ>��@͚5u��m۶�ۀʕ+~~��ɣ��C�2c�V�X����1bӦMc�…8L&�k�f߾}^����IHH�8�Q�S�?TG��JL٨�a	��-bS�#SA����!�s�1���xo���F�)�H*���.wv��e޻w����=$==�y�~@Qr_�����)r�k֬�������<��L�2���?�l�Q��Y�d
;�
��sLj�����h���V�^�z1k�,w�BϠJI>9㪐q�Jh��#p��a�9���Km���>Ean�?<�4��!��t��7+&L���	W�LUU"""0`�۷g�Ν0��2UU%::Z�軦)$�Dd�"�8j:(
��R/0���"̱=J�쫂�C�իW1z�Xڵ��c���/��f͚>	ԯ߀���L@��{��c�^�֕�=����e+Q�n=�O��G|��3�(�N��(�^���-��	���.X�����t��d">>�V�Zq�5�\�2h�x�۬ÚZ����!�h�A(��!m����!���%SH�w����K���Qz��Cpp�+W�ȑ�䵼�`�ͤ�L�(�tqm�˞�OQv��I�f��
�̱;.�s���5�[P��g�A	\&aaa�����e���p�A���E?n�7�H�4;��$�sA��n8.����y.�k�_u�瓲��E����v�5M!,,���ӧO���J�j5/{}ZZ*�񗶫�Ĕ#"��#��N��pO4LF�Vk�qҴiS�mۖ��s��!==UU�С�G��ҥ�9s�����:v��~?y�d����z��8����j�Bjj*����#�x�;e�,�KA�՚c�����=��g�K+%RSS�5k��X<EQ�������}͒%K8{��G��˗�;�p�?v��������v;�>z�(�o��������ٷo��w[�ne�����4m�4�c�4M�M�6T�Z����˗�k9�Ν#  �������������#GX�b��L��C7����f��GuoӦM:t���T��L&<�������݁&M�h׮��\�_~��ɓuGEEѥK��S�N�t�R�f3��b�۹���	
�49�={6�ԩS��͛���ر�M�6yȔ���/��2�I��z��������<�*��̮?��I�n��G��8q�e˖yԕٷ�ϟ�=�ܓk9�����ot���زeK�qH���h߯��ʣZ�nM�5�2͙3'G_	�[�n��t�=�x=��?����QN���iݺ����I����r���F�~�<t��W_y�Q��@�>}<t5c�� fn�iO2ώ���v~��/^�Qw�~1w�\��<���Y�&-[�̡��;w�q����M�R�~�\e�4��͛S�n]�����O<�Qfpp�ۖ�f#UU�K�.DGG�d�:u�ĂHLL̷�goO��N߾}=t���_{�xзo_�����k�ϳ�êU����<�	

���������=�z�r�ϟORR�������(
+U�T�M��N��?��г���gfΜ�c�����A����֭c�޽y�qY�B�ħ�Ν��PRRRr����p�Z�반ȊNj6�+���\� xgy�q�V"�
tRx��o�:��.���Jk����>�Ν;HMM�F����Yiܸ>6l��v���_�С&����o��ȑ�=�)S�ݻw��
0d�@��w+W��q�C��ȑ��X�W�~�it�ޝ�����[�����z���<&��Ν�f�y\o�X<�j����ܖ/_�cBw��)������ --�.�Qnn�d_ux��	�������{L�N�:��e IDAT.g߾}>|��):{�,v�=_�222�p�B=f�=�N��1A���u�S��m�yPn2e�;���n79��G�'k9k׮�d2Q�R%E��ne�L�3s�+W�@��j�L��:�)))$%%��gM&��*'O���NA2��nf�m�6��s���믿R�F
jԨ�k����}-k`(�z۷�����_6lX�}�r�3::��\Y�Vw��������			!<�R2%%�}�fm����i'N��('22�}~�ѣG�駟r$�6�L����+SLL�G0����8��G�y	���$--����\�V�v�o��{����ɓ�~��������dʞ u�@�^{�m�Ǝ�G}��LA҄����=�1��+WΫ�U�R%�;ƙ3g<����*T���<y2����f[�VF�ɳ�>�g]��d��sd��s��L&ժU���Ӝ?���@wP-3���s.�ߜ�Laaa
���Dw�'11�y����K/j���+�z�)\8R��Տ�~+��d����`�B
+��Jf�J�AotV\z=w�4�Z���G���Q��5|���8={�t'��&M�t���X�~C��s�u���g��5��֭;8�o�ߝ7o^���C̸��*44�c�o�g{�50�I7�p��-'��e�\f��f�M^��~cn2�G�Ք��_TTT����z��<��F&oO�C�Wf~��P`9ɔ����%**����\������y��L'9��UX���Y�������<{��o�����EDDF����������oe�͙A���}f�*�L},KyYMo���H�`��Cf���)J{zs:Dxxx��y#��l.P?�2��<������������2-�y�h��Հ-s�c(B�E1A�P���gU����X��^�M��K�{�ڵkW�U�F�ڵ�С��f���+2w��b��…��ݻ�'O૯f����о}g�~�MV�X�͖�uy��1�y���q�]�y��T�R��m��а�k����_lp�}�6
������v
AA����1��(
+�RC��b�(tI3$m����A���(�8�
+K	[
`���v
^F �pi
A@�A���r�m�1a�^�u5jD�N��m�����Ǩ�X�+5kV@U��PľS�\�[��~����7��ӿ�h�x��~�qG{L�02W� �P|�
+�,�7{��]겧��P��O���@�I�	�����=�
��Y��K�oN{�ݳv�)�w{�����gu����?ʔ)CÆ
�Q�:t`׮]<���T�ݻ7S�N��O>�|�r4j�/[����`�F�O�LOOϱ�\������q��7��h�O�xu;����^iTUͱ?����*%=Ք��,�'y��dOfx��4Mw��
���^'�#�HI�;���(j�Y*�~7�bP�2�7F�ÚR�c

k<UGr
�P��1+$,P��ZrFw3�P/�MT����e��Y��I[�(�¸q��믿?~<����ڵ�F����ѰaCڶm[,�k�F�Z
h۶�;1}�D�@�:5ط�����̜�d_�`2�X�nii�
4�hc�^z�4
UUsd[�R\w�u\w�u�;�z�تU�b	8�)c׮]u﯑��<��Ӻ��
+��Z�J��%�4lؐ�
��w4Mc�ĉ��w��i]���1ct�1--MW����I@�_��&��?�f���d6|scQ	��ߕ@r
���%E1�u�%F"�
+I�K/�W@ԋ����)��c�s�=�?�@ժU�0a���Z�jɵ�^��?�\<#��`6����HMM%==�������ٳ����[}:6fϸ��3M����?�zMފ�L�DFA��)cn6[�Z:e4���'O�̆
P���8�5k���?��(���g�^��=-kJ���—c����A�l���rj�*!!
p�h%���=YRU�}���i4i���h���
�iF����&�7�W�LI5��v%��Q�^�|�)}��X��S�N���Z"�L�޽{3n�8F�ŢE�X�h�?�|'��?B����Q���Ӓ@�q�Z����է��{n��4*����K\�[,9^�]w�8C^�088XW=�޽[ו#��CO���/֯__�e\�x1{��յ�&&&�駟�׈�]��cǎ�����*cPP��}gǎ���>/�; %9��>�(
+5k�Ե�X�V�|�M]e,_���2^�p�/�������s��eÆ
�7��S�ҬY3�T�™3g�g+�={���y��'��m6ow}R�I�Ae��>E��@�Q�
��B� ����Rm�cx����Q�����۷���;ӿ��DGW����ly�\�^�~{q�������Ȩw U�*2���� cQH�M��{�{������iӆ�{�ңG��_0������222�裏<�v�5�1
w���������	�qB�&��G��0���Ra��	�%���>����2y��|'�Ƃ � ������(<��sl߾���p{�1^|�E�n�ʦM�x��W�TG���f�]6E
{z0��HKY\X�� �׶'}�H�?P4��^~���I�&�)�v�sokq�A�?{�U�����m鍄PB���A��6DA�?"vVPD��� El�R,��(J�*���l����d�l��M���~��;sϙ9g�93sFAAA!@�
�4i���'���ӎxtL�p#�0t�e���������pWb���g�"�*�ҡA��&"����$���)+���1�q��s�]chѢC�APPPPPPP�@Ua�]�	��E~A��</�0��e���^�\{!�}^R@e�)((�Ņv�^�)�k�R ��7^�o_���eˎ�hѤ�i�7�o�n^
+��أ1���Z�����/Z_bb���'�ilӦ
��ц�D���
��������EFFr�y��h_D_��C�Z��&j��ܚ�\z饆����OZ_ppp�N�R����������Α9J�#L�I���aI����J�ȇ5B�*�NAA��S��v[���5��t�6�KYG�$~�
C����|��b)�~tt�����gԨQ̝;�LU{�jV���}������ILLT�QP��da�_<���b��jE�#�r6Ą��<�.�J�#=9���*W�I�����m�YJ�8�8
���q<6)@)��8��
�ƒ
����/�k�SPPPPPPP
�Z!��m$L�#�ɢ3�d��v�D��c�W�^�=AM@���UP$��<2�vj }�@h��̍(Iӟ���`�aCף�R�.�J\��t:q�ݞ���v;6��Z�:%R
+~�i1O>�$k�nd��-�~��̚5�6m�)�*U��'fM
�(_U�1�>�wT��f�UÑ��X�:&�©��^��l�r$-��D��[*�U�!��
+�\�@A�\p�r���[�M6�}J_LA��'+L�}K:���=�/u�þ&:q
��Ù4S�����ӧǎ��.�O>!77�	&з��f#
��E׮�s���}�?�];
���u�]G۶�IJJ�W�^JK	��w�}L�>ݰ:���9y�$�۷7��{ｗ3fF�={Bдi�K��͛�[�.���ՙ���ڵk
�9Bz�!�N�j�����޽�/����#G����F۶���B0�|���:��{ꩧͯ�r�X�l�
2��G}�W_}�0���Y�n�{�V
��Q^��p�>m0m�Vm�`	�sbW�@e�	V���mT�*(T�i/����|������z���T@"t	^D]�^��.ʚD0�,H=�HT���
��#̶�k'!d���lB�\�Sns���w��Vdl(�?|�0]�ve�ԩ���O���8�N�R-
!K�~X9v���;
���#�<�Ν�p�-��w�^%Х��w�5��OMMe�����y�C����d4M�TfY�9L�����Z���v;�7o6T���{�233ٵk�a
���
�N��ȑ#�V�\iX`��ن�n7��a
�>���@nn.[�l�
��,����U�;I�i7���{sϧM�J��q<�ܴl��/]��ε
+
+
+�������6�����2zb�	���Ș�����*��8$����U�/�j�_��.����d�[�������K���t~�9����K3Kٲrۥ���1�a�ig6�h!S�La��ռ����iӆ9s�гgO�l��Z,������ŋ3r�b�1�/�XDnnAA�J��B�3�(>((((T3* �`ӦM\���\.�̙Czz:�]v
4`ʔ)�=���,�X�[ÍSڰ�l��.�7�]�>{�>2g%��3A:A�TgW�a�{�Ta�.�Ak��	���R��ߞ�v�a�E��E0�g����[r^5
+��CҌ�����Ru��fҐ�rep�r�+f����#�t�@�WJɤIg�#�ݻ�����;３�c���7ߐ��ō7�Xm�_���{�&u�~��'��Ô�pn`�
+�(&L�����X,\}����ߟ믿�z��1z��2����Š�,�t�N.�XD]��=P`�e��i�iC�r
$A��@�\�@w���Kj;-���gt�FcʤJ��L�"�d����<�D3,�,e=��bJ�2����moJ��5s�$]��KY�n*��gΜ��ŋ�={6���̛7���=��S=�KI��}��8M�~�y�ɼ`źu���w�x���̙�R/
+
+
+
+
+
+
+�HKK#77�O>���.��Q�FQ�Nz��Ʌ^��͛2d�-*Sy����"�[s��a����IgC�{
w�5�Ω}Mixކʕc��M�Zux��tDJqCM!��YH�8E�p��a[AT�pzi���μt�R��!ĔFU����	�4�[C��&���2'���"�:t�C�����#GV+�B�V;wn��k�f��k		�%22���?��koVY�ˀ��8c{�Ʉ�j��4Z,4M��4Z�VL&c�^�4���`C댍�5\>l6[���l6c�X�uaaa��W�N�������w*���2 6|�Z��]�v����UW]�Ν;Y�lV��ɓ's��1�
�ڵk�T^hh�g����H���8d�뾌S�n<�]f.�a�ЬJ�-��M�P�p*yv^BX�߃y�h!�K	"�'�
�s�k�c�8ȕa���lwd��gn}�����@&+�_�?��ퟄFG'h��2�2`�/(7�ٙ>|]�iݺ]@�ըQ��;w��ݍ�:���-�B#K^���DՎ��(��g7�����7�e<P}��D���ٳ'={��K�.�hтy��q��Q6lH\\6l(�pd����D��ZE���u_�����o����oT�=t;��Q�5vi2`B�ʖ�X�2��^��{m1�ZtN $H'+w�$$2Y�2�>1�ѫH-[�rX1�~�>�V�򊜓}
��f�L
Asff&iii��		�N,��Y&#3���\�u��QA�U���S}G����9����s���=FNE���>y��Ӑ��{+涧����`���E#�0�J�8�b��r
�����`�.�����',1�cz�[�j���/]6{翹&�EZ�[��p��d��jJ�2]b��I�֜�f����$g���X�$���wn�Š�@L��
+O?��2=Azz��2�7]�
_�n�iS4*(���4V�OR|��4TK��u��t�
?�!33;��i�DP	uC��>RV��#���?�ܫ�͐�^
dգ�w�ঈ��>�DB.ZH�p���Fb�s)���>��8�����.�kM����&'/f#�d��T��)�'7Q�.�R�<�3��RZ�t�@�H�zj2RJ�u�-�1`@�������N�P�٣��2)�0�x۲e�|�q��N�ʕ+Y�zu��9�i���/ٶm������Ӽ���5Z>8�G}T�iܴi�}����2����hC�j��y��'
��l6J�ɓ'�6mZ�p���`>���l���)s}::{r.�c�r�o�8Ϧ����u_�;+^N�ai��=hJ�^o������)�sg���/
+I�����o��6/�J�A~O���s
$��{F8���)�4��O25)-�<��e��?���,_��ˡ�4��de�w^��ٯ��^dp"7�Ʉ�l��<-�(nܥ���h�#�!`xI���%8��h�i�1:�P�Jgxx��~��	$#""J>jm �͎u�����[ي�9>�+b�#^"�i���h&p;*��_��|���%��G<3ZJs��[�t�{WQ������H��Z�-HK�B�hM��dY�8z�|��=�t����Íp9�&k�cA'�Oe�[
+b֬����?�=ｗ�Ñ��Zy��bzLb��9�@A||�ᆺ�B�Ë/³ς�
�s�6p�v3�9�	d�!L%��;{�/�E�:���dq���I�`]���K
+�!�7m�z5�u�q�<��q̱��~@wb�Pi�X9�
+���w~���-�O������鎩�\ �����4<o}�J��u�k�ː���[�n<�п�<yJ��`�W4lXׯ���][ٴi��w�M��g��F ,[�!t�����j7��V��
������Ͱ���J+�n��3������d�<	Mr��n�6�IpDz��1��s�7�5-����;ӈt�`���B��M�qt�ә��tL�2\q��R��4-�=��������`��JJ�T����D_JɈ�s���ҥ=S�N'66�-�����غu�_�q����՝�~�@�z�HNN�S�N�[��9/pr��?4nܒ��@�ԩ�lذ�N�:����v�v
r����^-4�nh}.����X:�hU�Q4���%�:NƩ�"�L��*�):�������t��-j
n��/*4�-7/Q\%���C�tg��R��Z_6��oA�N�|DJ@n\�RUN�B����c��QZpVź�a\�l�������7�k�\�p�#����ٟ�Tb�f֬Y̘1�O?����ln�����x��g��+�]Ahh����q��з�e�����8��F��T�M��w�&%���a����Q���s�����L�tѮ���q�h^}��Gy����oߡs�_�����hҤ	���7��U�VZ_ǎ�m��M!��cϞ=
��ȑ#
�3))����֭ˀ
j�h޼9�52\�=��Æ�gd�S���1f�C�\�l���EDDp���V|L�
��7
+5(��9�L�,M�	q\VJ��Aqo�AFs{V=���l�W��uB� ��;�%���|�0�w$���r������څ�
&a9ڏ �"ش,zF�&d�꓋n�&����44/�f�z���L
�F�l�q��$�G�s|�`����>ߡC�l��%�\B��ݹ���ѣ			���Q��$��8�l���_�����q�F�,Y!C8y2���x�;	!سgM��)S=�F�b�ܹ�j
+��:@�A�Xdpt��/f��kc��
�b�@+��9�y��1h� ?��#B�m��w�A�~�x���T^R��̛�3����W�v/�KW�Ցܶ�Y��|V`�䟤~��C��f��ָ�J��z����stw����W�m�R2��K��a*lm�Kf��Į��eV���RplG;���C`���|��쳳S,c�i.��X�<ŋ9ñ���wJ;��ا���	cŊ|��WX,�x�
�֭ˤI��u��j������׋'�"44/��?�l#&&����۷~8�ɓ���]��(@WlPPPPP
�␙��w��o����ɓ?~<����u�]����L�8�_��g�y����-Z�^�[Ь]B���M��%��JL,!�M���qSpK��A��=-�g%a	ήԉ�f�y�~sޫ�8UPT��G۞
X����X܌	KO�纺�a�C�D�!��K:m��
+�\=��ۂ^�|v���<v IDAT�S/�
+��A{<��]���W��s�=,^��իW3k�,8�W\�g�}F�-����ڵk��RJ&L���w7����3x��I��fv��I������F$%-
��߿���d��N�<Y���5��Z1X�r
+~�gJ{���T�r�ʻ��Y��)_J��Oe�w.�S�v0���9�����G�����i�x�rW���+홪�9եk�ݞ��;���{�U


e޼y��ű|�r�y&o��7���M�0`�N�*S�aaatށ&���Sd#��`N˿��|:�6�Y�:�џ��dq��۫���Oq;+�Dː
P9�
+
+�8X�w���74�$�&���W�>�g�&!���͆�����/�r
8Ȕ��d����m���*LJ�;���|饗ңG�}�Y�o�ΐ!C�Z�|���5�/nݺ�i�^E�4t�͈7p啃���#�3�7�u�=�<�w�uqI����L��߬�,�4i��]�$ t3g���������*֭�>��.૯��<Ftt��~NN[�n�nݺ�gڷoOZZ111�:u
+��ɱcǼ����"##=ߥ�������Lݺu��������'G��cǎ���&����4RSS=e:�
��6v�֍���{>��㏌=����,��#��M�6deey�������lܸ��_�iӦ�HSll���v]י9s&W^y�癛o��+Vx�IMM%33�
6C���11�J_�d���������BNTT����tN�>��j��K/1g�N�:��!!!�ر���Z�hAHH���?�г�\��Q����ر#�خ�v�ZF�App0n����l6l�@Æ
=�t�ܹH@릛nbʔ�'v���{<���^4���y�]�^=,����~��Ç���B�֭=4n_���p��/�жm[ /G�ȑ#��Vff&���\|������E���n�?���׻������db߾}^�۰aC���<zb���\u�U?~�Ν;{�����_|�	����իiٲ���ݻs�wr�#F0}�t/]ѬY3O���� %%���y&!!��&�Z��޽ۋW�����������DDD`2��4�f͚�|�r�3�ׯgРA^m^�_!�袋<��|\{��L�:����&$�:��O<��ǏGA�
�x,�䥗^b��ў�x�
.\�Uf�
X�v�Ͼ�t:Y�d	�:ub��
,]��K/��]�v�������L:����M�I�w��A��=mp��i222���~�m����ر�޽{c-p|b�rz��͞={���&55!�
������f��<���^}��px�!�7.��/���y��'�={��svv6)))����]tG��������1t�P^z�%l6�\s
?��#=z�`���̛7�v��ѡC�R�

���ۈ��Rn�iƽa*�|��3��0�?n��o��-4��eD^�o��?��/�s!�K��=��-~ Vt$��St�Z�&�r��΅7~�����
ͦ־�b��������=���8W��\<�*�f�jƌ��Ʉۭs���?�A���ӯ��$&6套�eԨ[=t?���,Z�
�7����5�#<<�Y�>*����z�x>o߾�'NxxZ^^��+8�P�6�X,8�N�S��۲̼�����<r�{��{��h�V�٤�w(�ق����S^��.k֬�8`��Pfs���A^N��r�#��X�3�+V��M�6���W����[o�����_�>Q��,	!!!dggWj&�<�p��A6l��СC�&����o6�}fs�UWyߡ���СCt���o2�/�s�V@&��>�O��7��VNbb"������v;o��6�<�H���O][�N�`_yʩh;|����|���;����RJ���>�Q�N���7�d��
��ӇY�f
0q�D���˼y�hժU�"���ÇsoF�K]j$�[Pa������T�e��V^���9�	�5�%��̄"�$��C�R#�F��j�5�ҏ����
�ՙ���[��lڴ���7�i�&�k�~:�>}.��W_g˖͌u��Sٶm[�lى�N/'l͚?2d�������IJJ�\���/���^Y��I�=�Q�ߖ�L�|Y�3--���4�o�BS�]�)?�˿�ޥH��5R������AY�eddp��i��Oi퐿�<����_�w/���g��!��U�����OKK�M�*���*�_e�Vyd�<�PxTYۻ��Px�-O9i�S�N���Qa}�
+�]r�݄���q�F6n�H�F��R2|�p~��,X�L����LA3�b�c�9���S�>�J,���g��mp��*T��=h
+
+
+
+�L&�����n�
B�0	KN�C�)��t���?_NƱ�hf�ݻ2�f\��rc,�Ϝ#=y�S����Wddd��MӰX���d�[Fy뭷���_���{-q��
�s�g����\Drr2�^{]�A_��
+
+
+
+
+
+
+U��I��+���t�.LD�ؙt����D'<�L�N��,����du�q�(l��NKRP|H)���k9�~���d�g�D�mXC����̡plf���)�s�2���!X�6�g�}��K�g�^����k��͕�g͚�p�a„	4n�����q�\����w�r�}�3|�@�������+/�e��j������ܸ���v�W��t:
ZI)���֙��c8�������x�!77���
+�1
+Fˇ�4VV>��U���0�Ң�}����U��`�'�x,��M�j��@�$��A���������
+
+�C�K�8��+.tBM���&Q��й������H|>p�] �e�u�_�:���e?�Õ��'>�/�<������Z�ϟ��Rt�]BBC����B�bŏ���[Y����>��r�5j�(�Ν���2�ʺ�8PQ���U�c��Ͳ�Hk�T�&�X8X,��Q}�܄� L�r+3'}�
 �}��(nER|�N�&N8�������Xl��ʟWP|��	��'��?�v��%3Hw��V4r�L�H]�Oo���Y�5����t�2�p.��o��;'xƃ�0n�t�J�.]��l�>�ѧ�eE��@�j��X����F��&��Ƃt*��nU��vm��dBw��k
Y8�)�"�G�K�g¦egݟ���@$ooGx�#�k���O*(Ԉ
�簋��ʇ4�c��ғ��7�C��'���"�t�S��(�y��UV@?��]�.X,p���?~�w����y�8�j���g�Q�
+H	�((((����N}[q��
��"�.��l"����"nNdlCZ���?
�ێˮ�RA!��e�ؗ�3���4$�&Hd�3�;D~[%
�;]d�O�P
��O{�����H���a�F��,_�c������ȑ#J�J��Ҏ�R4VB����vT}G�h��ht*��n��B
�\�M
+�����J��$
+���ޜ��Dͤ�q,�l��!������Q!�������S��I
�
+�*�1�{�$�/W ��7�|�.8)e�ב#G�*Kl�|̿�–-[���k4�III�Z�*�É5�ƅ�u�VC�kjj*���j��;�����]Siܸq#�-�����i!w�y��|
7��v����F���'O2u�T�W<����b`!������;�&a|f_��b�7�r�~�t@܍�+�PA�\�I��y�6D;|�tŰ,e�jI8znB��h����C�y�݇NW����d2^��b��<5�͘�5{���j5��!
+2v�ipp��6��a��j�(����@HH���EGGN����h���(7=yA�ER p��C��� ��q��
+a�))�n
��,��Z"��p�CJɼC�򛜂.���a.u�g!>��*a�Cnn.�|�	�~���H�O?���?��Z�瞇���Y�v�O����
+
+
+
+
+
+
+*Prs>\lA{K4������>���g{jf�Ͼk�9PP�
�w�f|=
��;�Ԍ�ui�Be���qI?]%n�
Fǎi۶-��?���*YYY<x�w�}���GR�2�o�C�}��� 22���ҥ�
+�*(((�L�6M1A�D�$��@Jɏrwuz�ݛ90�D��ѥ݇Q%p�6�t��m���o��`��Ң�O�1j�ka[в��&���h�
+�p�]��n��}'k�9�o�&_�|N��/.,�o�2�u�m4�bgr����k<���ݻw��7ߤs��l߾���$v��
@�=?~|��_�^n��v�������
n����t]7�Κ�����B׍�:C��_�d�-�t:k�p���e����v����333k�|Mce�C�u��29^qGwf<���}!���D�E��3�����	��lC�KVb�8U�*(�$�������d�
����N�apݩ��|��p���VZ��' xS��"��|�(��J��&x¼'�n$��ƃ����/���?���v���r��������A�u�N'����B����m����_�ϩU%#++���ڶmK�6mj��z�%��`�Ԍv:t������_��#!!�o��F�ءCڷooLe��8��ӧJ��Ç
��j����Z��ӧ
�/&&�{�G�"���&�� [�AK q�'1���c嶧a�v�ѻ-�$yk�_�,&0-]��	RJ�x���8bq�	��8�hJ��H�Ӂ
!�Z%�t��ז���@J�…
���/y���IOO穧�b߾}<��8&M�TmcՁ{Y��K�	������[���ci��0CCC
��W���
��
�ht�|�7:�duȇ�2R�u����F'4:!_m���Ҩ%�]���r�O7���nX�� ��L�>�F����Y��(xni��i&7�~�N��q�Pd�p���T+(<����e`��I�8���L�G��~ʇ�K�+�R0�;b��x۶mK���
�5����y�G|�oڴ�
+(�S�*((((TT�ҌnMp��m�d�����&7��F�Cb�����'0�]���w����I-UP@4i����O0�p����v���V'����q���<J��j�8����Vk��S)%+�D����ҽ{g-�J	N�T�^n�i��'B��|(�A��k��Q�Ш=���yfR�Q�B
+!$G��Du$�$���ˤRA���A�X���8*�D�;�R�a�rk����?,#��c�:w���n�WV�S>�l6C��n۶����P�f����_���k��h/^�Ij���x���
�kxx���q��!C�X��I����ҥK
�u>����5i��P���v��yCi���5�����J�>�eh�Q�]N�b��Jt��_%D�&\���	���sxc�6u,��B�pu��8�.t�y�F�9no�N!�q�9~�\�	�|
+�ƞ|�����t�v�����:2�=g4���QX��l��4VG��5}�ȱ��ܪ��s�����4VV>T�22y��?��;��N��qR���:���m���j9�����I�Ȧ�ѝ�t[�SA!��J�;ߌ��2�
+��Y�v5�ՙ�U��:�Htt?XK�p���Çw��{��C����k�M�_��L%<
+��27����b��
+T���޳�W�>���`��i�'Q�JZ>j��8�����H] 4�@A�&�f9����)3�G5����~r�%�7S��|�/����V��رw1}�T%4
+
+
+
+
+
+
+*P^\<�=[V�)򽆙46�EH
!$��]�иW�1c���c��u
���s4��CA!�Q�i�c�r8�K���q�C���}
��R����q���@[
ХK6oަ���Q5�R�<��#�y4Z��A�衱��Y�Zm�a&N�W^1�x��8*���(����,n|b dkW�H��K�`9�x�.��a�����̜�5�5�?*K��B ;�R������"q!%���?ӆ�:^�8p��++��'S��Đ!�+���<������m۶4�P].��c����ڵk�ﯨB�N��4<�V�Z�_###�0a��}'==�P�HHH`ԨQ��h��
��}��\~���[ӐR2m�4C��w�^C�j��xꩧ��ĉ��͸q�T��^+�G��-ƽg9�0�p�A�mU
	���v����7�@��E~.����9v�w1� ��s∊���1�ŋ��:~)�,Oy��V�i������4*�P4�����F����'��ًK��װrR�J���\���Q϶��Vc��5��%���TP�!:�e�FH�d��Pьù�H�_�N�H��� �/e����u�K3���LU�N�x�G�]y���~���.��%0
+Շ�}F�b���0��xa(�b|���"%��͐hTǑ]�iQ$��RA�� .!��=������C��0	w�V
�큳^Dž[��s��% �`Æ
�lْV�Z�������#��^�z̟?��f���W�,��?���+�N�~��ѣoW�Rdee�ou��X9���4�>�ۍч+M��媖#��N��Ec�x�)�v���egg.��F����� ~�F���:N�y�;�E����۪%�ɭPA�� ��ps���f��9��!d��\3nf����	K���Q�ˉ���VM�=�~���2n�8�ϟ��ѣ;v,�]w]�-��ѣ/�6�g��ul޼�ȵh��JPʀ��0C�۶m����u���Zߚ5kX��l�JYi\�h;v�0�δ�4�z�-���>��4nٲ��K�V��_p���JgBB���9&O�lh���ц�w��)�y�
+�^m
� ���W�\�{M.Gh���cFH����loA�A�V5�ʢ��Y��۴��-s�#}cg�᪐�1�g��
�1g�\K�2��%��xq&.ѹ�-^����\.���:u��]w�ETT={����$%%1z�h>���j��l�Ѵi�b�W��ANN����y��8k�V-ٱ��V {��0�fs����Z���WxkQUC��b��:���v�)�=2�*at`�:��h++j@EgҸ��>�j!E&�	�&��ɾ�p*f*((T��=�"�-!0�`KF?̵@�4��2�s�⊼��p�Hf{~;������ʕ+���OY�x1{����\x��޽���D.��2���
���j��_�СŏG���%!�
.������WJ@k+�fx�aoGRqEA�0�;+�B-V͊7�ƽ~5s�X��&����C��] �8qK˙e�j���B�t�r}}�dZ�h��[���Vsu��lr9Q��t��*«����n7;v�S�N̙3����G�
ظq��4!x���y����+�:u�l�V�	
�̟�1�7�����W�ˉ�����ٳ��>��n�{11
B��������x��P�c�B�J+�VT��x��;�����Rs
�J���U��,Հ
+
+5T'
�2/�I�ؖ٫�?�
�_.�#e�����֭[�3gRJ7n̉'<ο�9��n>�|.�=�0-[6e��|���^��LR�
+���իW����������Y�fl߾!B^{�?4oޚ�G�r��
�����߀p��n������h�\.
+�8+h}��g
D���0��H)��5vkONN����nx����
F'�����6XFRSS
�K����4J)+%B��Á�����)��t3�zZ1�7v�r��GC��/�~�.���s�e3�>�ڎ�RPP�Z�����F�Msq_��� ž�@/W�ߞ��-Ώ��:�-0�/eer�g���
��͏?��M���K��l�L&�nv����P���֭[ѳgO>����bb���a|��,RSS���˻���q
0g�n��F�β��F�b�ܹ�U�yT���j��S'ش	�����I���;�F��������>Kg�
�<�O�ӨVTf����)��	�
߹4�f]�0� (��.]
�
+
+5}�;��Bެ�;ү�ѹ$:�_.W`�.%u�&r�x
+�ڵf��u���R�7o���{���EN� IDAT�С�<�9��v����'�u��_��qz��n ""�ŋ�9���?&�䱱Zh��w�󟧏T;���h4�pv�Q(�*U�?���3�':>��DG:���/�	v=�(IAA�:�g��2팆�9�h�KZj��ѱ�$�/����"%� 9�7�t;���Y��t�Б	�q������V�0�R���Ӱa"N����4������k�۷7��q��A�4�G�<S~��\r1K�,�Y�/c�h���>5I7N����kC;֚��h�0"""�>�U���_k9�*��KJ����!�X�4�	�qo�����;�rE+�*((TZ'
\5�9G�"4aAn~9u;R�L��Ɓ��\N2	���|�.��v#��!11�H)�W�O>�o�qx�_���[ٰp�B7nL�歈���������4j��3��#::�-[���_�{�=���JϵbE�9J2����^�r�:�#?뫮�������LOOg�Ν�ߖ���PZ9B����,e��,��:�:H�Q�<׽,�P�/�c����m�V��ʴgY��믿.��Ҟ%�+#F�(q5Qy�hYp��	���O��xi���!C���_u��
+>��iv���7Ͽ7j�(BCC=�9y#(ȯ�+�!��rK��Z�>T�{��Y�|��Q�H;!����h,O9m�+VT8�~2��NB�9�F ���K�dT
+t��6T�ZAA�8�_[r9�.� Wd��17n�~�
+
��ɡN�X/C���oGvvn��W��u�&�kל֭���z'�<�J6l��O>��2p�t]/�90��υ���ɸq�����=�ѣG=���∍�%::����k�<x0���^WA�O�4L&�����P�;�UN��͉��cѢEԭ[����s���[.X��b�≦i���{=Ӫ��)@G�!44�s�q�ƴn��S��
�iذa^�,[�����g�����iҤI�r�N�����)gʔ)^��fs�
+�oll,111|���^�9r��3&�)�]4
Z��28;�w_����+BSHHH�v0��^�X�V/#��^��������X��JMM%$$ċ�~���������.��2�r֬YCTT]�v�Q�F���q��!�rڴiS��Gyī�3f��p;DFFi��'Oz9�i�j���_DD[�n�<���Dtt��3Ag�ťK�z�*,W�&M�z�iӦ��^�z^�MPP��~�:uX�`����k׮E��޽���G�Ν;������/R��w���t�b��x�b�֭Kll,6��+I��iԩSǫ�
xє��Appp�v(ܞV����X�6mʅ^H�^������?����j���;�i„	�:�/FG{�lg���iE�.66�?�Ћ�Ǐ/�L�N��ڡ�����d������/����'M��VPPYYY^��_���3qqq^��Έ#|���;ＳM\p���o�NDDD=Y��v�J\\�������n�ͫ��s��;�Mӈ��/�>ӧO���ĉ��o߾^1�����g0<��"���:�N���فS�žO�;��N�p��pS�hf�QP���-�+:C7t)���G�����RuL %
����_��&�iK^`��+���K���ؽ{͚��w��]���`ٲ_�Q�>��r�ǡ����޽�ɇ�[����u��Abc���f��7x������
+D��}	ݺ]�+�L+��]�vq��
������{���f}>�I�T����1�~﫜�>S{��a�޽\z饥�oyh)����A��������B�:����II^ϕ����'�~q4�'9Wy�a�ҥ�jՊ&M�T���Н���̙3��G@���YBBB��ήP_�H;<x��k�r����M�K+�l6�r�*��+��v��СC����o2�/,,��8?�����C�SG��;�|!11ѣ�\�v��7�x�����+o;���p��)��l_�egg��g�1f̘
+�uU�c�U���W�
����9>Y��#X�r7}bf���QP�r��q8dee��~4M�I�&�ݻ�s\jj*'N���Ga�Ν�L&��<��c<��C�F[��/��m��ഫ>�2.�M�*m�{�Б~J����s		�3�V�7oˀ
}hԨ6��w�����23˗� 1�	<�h���K��M8u*���:��S::�����ې��CJJ2���������_���>�kٲ%-�������cIr[��L��l��$g�<�	������2�oyh���W���^Bh�6ϸ��kz:ڛ����,�*Z���(�8�ʼOit����ge�S�����ɬ��WE9��m���v��F�xq�\v{�<H�ɶm��m
�!:���c�����..�p8*�{5
�g���ä�H"u�՘EX�	
�z(�X�H �`���4i҄�-[��/�йsg�7o΂�׿�E�v�x���������8q����'8~�8v����4233y��8~�8G�%99���
+�&��)#9�7h�
+�Zώ��62�$�/W'.8�i3g����ӥ�Edffq��a~��wN�8V�v��_��o��̤n~��nt��	�����W��O��p��7C���Tb�چ:u��sT`vLAA�8�ݰq�����)��b�if?�+�qӸ�|��U�\{����4w���rK3i����O���B�DYg�m�F�z�8x� ���4l���Ǐc2�hԨ_|��=���9�>�(ǎ���g߾}̚5�N�:�h�"����)wÆ
�����Z^{�5�{կ_�s����Y׫W�X:~��7��V� �5^���n=
۲zk�O��x�:�V'�91c����s�πߎ�+i@~�ܵk-[�d�޽���Ӻuk�>�͛7�i�۷7Xf4�;�3�׉��L�����L'88��K���ҥ_2p�0,�ƍ�{�!7n��ٟ`6�����^������]��6>���8�S�N��g�يd�14���^}�s�^иq�lLj�l6��u��6�w���Y�V�
+$���4^�����<���`

�,�O�igp�AA||��uv���X�L�
+�H��?�Oe1���X)���D(��V$��]�r]�sd�#��@�P̛7��?���7r�m�ѠA&O�L�z�x���曙<y2�\s
{��%''�ƍc6�i׮�����9r��
�0V�^M�&M<
������BD�<W�R�
\�d��j㚽o���EA<�q��8���kP����)S��������9r$IIIL�2�w�}���N�8A�~��ꪫ�Ñ͸qw�|y�槟~f��۸���y�x?8�yK�SR�s��Q��s	�u�V{%b;y2�={��i		
���_��F�e�����TF�������'^h��n��w������V�X����ѯ~N��y�˴i�G~��r��k-�Q��DĄҲ]#�n=�Vh��E�r-Q�ş�-��,���EϘO����n!��Pc�BE�[iX�f
�����ű}�v4M�]�vlݺ]�iݺ5'Nd���>��.��G}����O��m��FVV'O�d�ȑ^e�3��wrr���:u�x=׳gO�~b�gH�Å^�ʕ+�5мS����	h���h�j�>H'�/�8��R���_z�%�Ν��ݻ7nݺu��{�eʔ)���˞�$�6,���A�6�������a��dee2t�0Ǝ���͛ЯߠʆY��T]bc��9+���S	��˪h$oɿ��u��+�i>��jG�w�F�p��U��<���
+�*g�����;�n"	+dBi�d%�t-a� G� �C�9ͯ��⎾���W(�r�ѣ�&M���o�l6�駟2~�xN�>�G}�…���۱X,h���fC�4�ߺ�c6��裏��5j����,���J)Y�h�9�;���ĉ�믿�-:,��LJ1{��
H�r�6.��IMH�n�:L&�K%Тys��?v�X���[�,YB�N�<Y��nw�F@��xF��o����;��7yG��=��\;?<��,'cƌcϞ�J�)1X��w+W�%WP�f<�0<����3g�����єoP��U�,��y{�|�[1��<�EDS�*pK����S�~� u]5P-�?���it�ܙݻw���EӦMB�g�t]GJ�9��>��g��رc<��=z�3fx�7NII��nq��ξ_t�E喡����C�.�:�: �䯿��aÆ>|��t�
�
d椯p����ⴳ>Q�#z��.��J�o�L�<���͛��sϑ���-gfP&M�Č38}�4w�U֯_O�N���ڶmAFF����(�XV�^M�=�/;;���\bbb�sժU��ٳ�*��a�Z��v�F			��D�r�ԩSb�|�\.�?N�
�s͚5\r�%��g��IOO'..���G!dee�p8����{�=z�`�ҥ�_��@Ϟ�r�ف��I
+
��IJJ�Wn��@�{��M���bf�5�b>�2�w��
W`�2�\*���d�믿fȐ!ԫW�'�x��3gR�NڵkǂHHH�nݺ�l6bbb���#44���P���h֬d߾}�3�W�ZŮ]�����x���9t�P�F��b�wV'���
OTZPb�ƍ^[��w���r&RJ�����Wa9J���~�r�J������{ILL�'�������/g�ȑ�1°w5j���z��E��II+�ق��_i��۷�_���:{��Uu��:����-���O� ::ڐ�UJ�����U���L�ϟoh�}��5���Ǐu`kX�ٳgk��)%K�,)�2)��@1k�,\��¿W+�A���y�GU=}�sv�;i$�����H3 ���4
QP���#(�E}��B�*H�%��@(�e�}�X��-Hv����ɖ���2g�̜)��4lV�c�ϡ�bk) �(:@�
�E��e��	�!%%���t���	�J�*�ٳ�B�#�<®]�X�b�;wf͚5l޼�N�:��#�0~�x��ݩ_�>gϞ�]�{��i��Ç�l%����BQ�EȀ��hrrr���v�(WWWY�t��,:��3f��;�ح
U"B	�C�+�$-�c9m��ۙ�6`�1Q�Z5��"""l�I��W�!��o���˗���,V���)S��\Q�WQVa$��S﫸X��T1�(���P���/9�
+�]�Qac�mC�������
��Gk��~�z:v��
��e<��s��p7|��
P΂٤ǐG��^p�D�x�	
+r�(��8�`.K��7H۶m�믿�����ח���jժ���$I���R�vm*U����u�֥N�:xyyQ�vm>��c�w��w�}��������y��'9v�����ƍl۶�T���`r��	��h{3����a���P,X`W�W�$�ݎdi>J�	�����
��ww76n��O?����C1bǎ�fϞ����ɹ�8Q�������Zm�q\\�j�r��N��:u�_[��M�^�:��Lm~���c����(g�̷�=��f��=�+���3�ųH�԰^}m}B?D-y:�gi�%K�ǖ�qQ-Z���ѣdee���;
6$..�	&��K/
�������s��e����ѠA�_�.�7?�����E�8n��d>**��>�\���ʍ4m�������Yݧ�7�\�E�Ւ��`r���7�0k�,�b7�4xB~}�o���@�Zr㚪�n�4߈����>����9�N8Q��~�4�8&
+
+��zVV�-���槻N8��M|�9�k�~m� %%��K�`�ڵ0x�P���b�\��)5d�f:X��������=�8~<	WW�{����xg��a=������	\Q��@�WI�����x{{�����ŋ�ԩ������L�:!�[���ߟ�z��z������iҤ	���q��%���iӦ
�����nݚ�+W�g�
D�ƍ��"h�5
�N�r�9q���
+*ܶ�_�����N��_~�7�9s�p��I����$$$KӦM��իǪU��:6	>#KRɹ�fu�U8��=�
|aɒyL��-۷o�-^�6�`�j�rE�{:\��w�*���6#�V���m'o+��jtvH��R�l�<�
[�5�����t:�����g�f�ڛ���_�
+�$I�={��M��_��쳃	�m��L��v��3�rDx{���`s#�$Iw���J>>>����h�K�4Zڸ��w�	DGM� 
��@$�D-�wǜ"G������9�>}:���4nܘ�F�ڵټy3
+���;��SO����ĉٲe[�l!>>���X>��C�����?J�"���Ju��/2u�T�8}�h4���Q�,���ؼy3�Z��[�;�x���4���������Ο?���'���dggs��j�,��d�z��R�d���ԬY���HN�:�ɓ'�ܹ��re�����ʕ+���|��v-8��Y9N�K�ԇ������j��u�x����N����I��5��{n~~����))��4�C�z�=$�{&�C�~�X�p�M���Xڽ�����}+�>˜����(9����M2ȷk׎�k��}t�X�[���,�j�_�r��ĉ�~4h��;�a���X���~&33C�l��w���:u�ꡍ��C��~����1����\����YY7P���r����nРAC||�(,����ø��ФIS��������#��(���w���adggr��)@дiS�~ ��e�Ν(�.7+�hؿ�*U
11����s8�]g�
�Pn\�EkE�(��v�i�F�)�8�:?
+�>x�d��8�ر��7�����_MÆ
y���y��'Q*�,[���}����Baa!Çgʔ)������M||<B���ٸq�|_c��k׮�1G�R�m�ԩ�X���]n�����I������bo�|!X�b���t�Ё��4֮]K`` ]�taÆ
2���������������|��'�׆�9I��S�u��1i�9����BCCy��W����ѣ�]�I�3��dƸ���%t"�K�Q4��y8�CBp��I�{n[���A��Q(�^)�O��G������/���Ʊ�{��+�(ʾ�BXOv�`�?��˻w����>�>
+!,:?��3�D���ٳa�V8}���5u�4����t��|�Z�*U��w�u�p�j��k�L����Bv���ƍ�r�nnndg�S�jM�����͚=Į]�e�nǎʹmۉ�<��Kpp �vm�z�H@p��I~�%iiW}쨨���@AVV:��5d���ł�޽�c�N�f���޴��`y��ē3��H��$������(��P]�ƪrUh4�N���ٳ�p�ӦMc�ԩ�={�?����~��}��1w�\���0`[�n�e˖�lْ�[�ҿ�,Y��o���L^^����z�B�$4
�;w&++///���x��G�\�2!!!xyyQ�jU�T�bӚ�ƛ�q}{G�#�
!puu-���gc\�r��77�V˱c����������˖-[B���˲e�d��e˖����$It�ڕ: Iaaa<��3t��I��ҥ�|o///���ec����(�$��v������>��C\�� I�&
+Xv�
���½��s��曯��m������//o4��w^��?F�4΁*��tO�q�d�5���}��
��r�J���Mb�G��p��쐙�iٿ�f^����r��4���g�E�n=b�ԙT�T	77�?j�s�\��
���+k��
+�<�Kj֬yS��#,,ww~�u��\Z	�޽����#����34oކ	�˲�!C�Y3��!�u�N�h�0:�>�r̘����J���ronn6+V�K��=�y���YT�B��-�
������bݺ�C���EO��r27�=���8c�N���}�*m}�>>>�Z�Jv�^�p!:t��ÃQ�F���@�>}�ԩ+V�gϞ<�����ӦM�w�Nݺu8p 6l`޼y�hт��DiѢ���gҤI�Z
+�I�x�7�)K�Dll�C-␐N�<i��(*F^�̙3�={�Mw(���YV�g͚����
}mh��B��F��}�U����'�$ѴiSZ�j�$Ix{{ӽ{w�
ݻw��ϯL�����K�W IDAT�իs��
�Vxo�s\d3B(��Ps6��K�&���	;������kՀ^WWW�p��-B���l�7N�8Q.n���1$$�l�h�[o�i�y��и�lصkgϞ��?����c)���������/��bSکZ��M�5%%���I+V�h�>;v�
6�����PB0nܸ[�x�b5��*���KR@I���|��W|���Է�8o�uk�,�����>v�y��8�����|���ףE�f���I�Ν���"zV6��U�����e�l�ĉT�R�I���ԩS�={�/����RӣF��V��7�!������-�Snǻ�~�R�Ɓ�ʔ�222�1c���`C���!W�
W�k�8���J�V�D �D�6��R��i�R�B�Ώ��ko�k�.�m�F\\���ԯ__vR��|����ۗ�}�Z,^Cیk�{xx��x����~���#G:�<������R�������oRE�$�[\���S��S��&22WWWN�:���'�+W&--�бcG�/_N�ΝQ*�lذ�*U�P�n]ڴi#[_��1Bf��Y�]]]e�
!����]��F;�3�B�,Y"��ۛ����x��w�ر�]b���^o���$>"I�qMU�*G�
N[��	Dž^y�z�jөSbc[��]��Ɣ)_��+#L�$G�Et\�zզ��j�6O�V&}4�W�n�$4o۷����j�'r��<�T*�$�+(�m��k׮�|}��},���ꫯ2n�8�V���p+4��<�8�������KO���2�4	!ؼy#/�0�3g.������o�7M��U�� 00��4��5-�����n�Ѩ9{�4�>���|���M��UY��/""��������A�H��/#����OR�����B�M�K�V�#1q?ܲLy��$�tz�XP�t�(���rQ� ��\��=��������(��jشj-�۷gܸq,_�������㏛(E�$�e��Tq/k<���5�^^^���#D�6s��iӦ���.�˯Z�
+!��������׭[���Z�j���&+��$ѭ[7�J%�$Oݺu�$�D�7�{����`-^���˗�uL�~�W؀W��H.���P;���#�Rk8q�<-Z���Ϗ���^��%��'�	��ߟ�Mc�ʿw��
.��~����a��;v8��	'� ��ￖ^���z��˦��-O��k
B���c��ל�B���_�/CC+q�Z��)t�����Q*VA�����:I�@����_����t3q� ##�N�N���_�Z]��A}hҤ�Cх˽F��֣�\[�/	��餤���?����I�.]HHH@��ѻwo���B�?:�|�����P
+
�\��'���-�]!�8q�����{777��ŧ�z��4I��>|���0���IMM%##���h�Z-��q��!�2e
+���'88�C����C\\���l޼YV�_x��Y�d��$n�FC||Q�_��wG��~�����n4�tΜ9<���&5�F��q$��NMp,���C'��y���b�J2�D>)I+:̉�S��´d|�����]�Z5yOL�N8�D�b���|���E�n�"
+��ߚU�Y���++
���`���[���m;Y$s.
+}����ח�S�2`���g9;v+#�Е��F�\�Rv�((����3���(:vlKVVׯ_%((T6flڴ����Z-u�ԡ�P�G}ir�ŋ^ݡ���0�{�F�V�%::����j5����H����h4��o'�V���.':[�b�|�9o�<:t�R���?��^�z�5��C�R�zuF���ѣ�Y�&��u2�>��t
+��b�%� ���8@i�u�V���Ç[M"g�
���w���s�s�N�9r��3g����?�����$00�&�]�
+��r=r�H����$�
�$IxzzZu3�E�|dd$�v�r2�Uca��|m���v���/Hf��@��s�M���=�7֫א�3g2mڴb�~��>�x�3A�w��
�ϛ~�d	�Wl�pQ{�N8Q��Ô)SL>���!  �����,?��_���r����/�aӦh۶�mɟ�P���S�Z(/�8�L�ɧ�N�ʕ�L���,���g�����;�!�}���}�v7Y�`��Y�:uJ���l��N������0aO=�4!!�6��!q؊+5j3f���?�`ذa�1�y��1{�l^|���WPP��i����B�����ׯ���cȐ!<���lܸ�)S�0p�@&M������$	�ZM׮]e�n��
���h�Z^x�\]]������|}}������I'��ڏ�R`E�Wp��(�G1c���<��СCj����!11�&'�E%�3$����e�޽��������={(,��nعs'G�AAzz:6l��ɚ5k�h4H����y�G�$�����̊*݌�%?���U.K�T*M��3��x��J�/J���~ء6�
p��
����K��
ȯ��ބ(�
+��ٓl騼-���#���$���ЩS;��n�H���!={vA�S[��	K�=ڦϫP�ի��Th̘1w��תe)��7g��Š]�vDGG;^�5j�(Z�*'���ӰaC�>sĈ6}���u�ֽ�y@PPU�V-������t�С(!E��+U2��wo�7�ے���Fqq�d������ɍ׋���xy�ҋ:FZZ
+}���>���`�i��큯o���
+��.7�`k�}�f>��K\]����QG����_�EttÛ�`����Q* �_����	7e+�O?�ĬY�R�B�z�yxx���͇t��b
�M�f�ؽ{7
6���:�u����͍�G�%+jšm۶�^�ZVT5�m���Oa��$�ϵPW��V�/RP�JJ⃦�&�K�Sk����sGq�.���+�������̞=[N88u�T�x�	*V�ȟ�I�^��k�1?zeI����S�z��Я�ܵc����Ek�� ��ٳǮc/FSW�FG!jɃ�!_���a��©:�ޘ��A�
+�����|�����Ӈ�gϲk�N�6mBxx�Vm�g�ԯ_?.\h��4>�0}4>�/��b�{�n#p�֭ٴi�s�q��a��_���o��?��C�{ｒ4v�����x�3�3�E%=B�om��jB(L��1/=m��%I�����\�V9�	<]\\�c��<ɕJ��3���$	WW�P��j��
+!�h47�

+��j�{��M�4�ܹs�����CѴiS����x�"M�6-�=�ׯ�F�����Ǣ�r!(���3:��~��\�uue@*�1?u���#��HI�Dzz���;v�_�۷��7�\�t������P�S�4k�������ڥ/�����ȑ#��_|��+"I�z�2i�q�o�fm���Q�6�}�֭\�ršxɱc�JEw�f�޽{eZKNN��
��X��X��իWBp��QN�>�N�3�3��LNN����~�1�K
+\E
+�_��G�t�u�q޼���$�ތ�LHH��O>@�P2v����{�N��R���Yi��>ּ���w�ч����t����|&gwΣs}8�h3+������Ey���	ׯ�QH�777���nE�������m\A�BGR*e���W�qpss��2������[��J%���xxx�T��R��D'����!���<��}��QPP@�F��$�}���P(hԨB���o5����?}�tz��IPP��������u/%�T���6��s4�[MQu0M��z�t�U�K���~`ذa���3o�<j֬I\\G�eǎ:T2���A�7n{IwJ˖-s��h�v�6Y��9s���3� IIIIԪU777�ΝK�:u����ȑ#�ܹӄ��T��&Iׯ_G�Vۼ�q4*--<���x�
y��yR3���x��Q���3q�g�\��n�zs��
bbbX�t!/�0��/���yO��NX�ȑ��/`^�n�Bx���R����N8a;L�<�7�|���bq�?w�	���qO�
4(�:����8q����xzzr��	������,���<��󄄄�%�V���X���Y���<��*|�M��	D �K�.skhI	�Z-��Ǐ�ȑ#�>�h����l�B~~�l�9~�8B�_��֭[��=z4���rܶ!�]�z�L�(
+��Ư�������7����z�e=gIII#l݉X�d��?�7�����ȴ�}�v
+
+
+B�o�>���Bp��5"##��������&�f����s3�Ӛ�<ːք��o�5���ό�J�t�+8��xᅑ���4���_���7��zO������
+���oO|��6}�իW9u�M���'���|��Ǎ���T�
7.ճ,X`�y,��e��'Oڼ~|AA���N�4ɦ���ʒ�������s�̙r�o�qg���reK��0q�)�p�f��Ͽ���{�`��ݮ�Q��ѵkW���	� 0ܟ�x�I\��4�ffn�����2�����)[B֭['�3/\�!���r�z!�-��DFFR���楗�͛7��٪U+�HӸqc����$���@Z�hQ�l��r�m(��Ė������;���5kV�%�*	7n�?�@ANN�	�M�:���4����R���2�
4o�\6"5i҄��H$I"((�$.�N�:v��`�9s�P�fM����S��F"����6�8a{H�DDD4
4�aæ�[�����Cv��矵�^��9P���	l.��8q¦�|��w�W���1c��,��;W��2��o�1yo��d�>�����z���
����M�9Ѡ�����6�{�˗/��h.gb�%��?.^��!�&
+�ĉP����N����P^���������p�,K�	��l�R~1J(ВRIq�TY�����͛6��3_�t	!����޽[v�7��!رc�\��u�����I�������K�D�~�Lܞ�OG��Vݭ��c�����������
���f�GQ�����L�͛Mi---�ƍ���ž={�r��v��5$I���駟F�$|||Lh��_$,,�XZ3~_}]�v�m۶9�Ai����j�*�C��J>�$7>
+�)�;cj�|$.�]��m�6��|���N7���8s&�j�"�'��aݱC/T����5S���
���\��y�r���ᄇ�;��	'��'
���n��wg�@߾����>������{��N��i坘�8%�响Xz�K�	
5�%��I:R#J\�Z���mZ�.Ʊ��T���S�J�5���*
+Z����;66֢�[Q	�l�$��ƖYn����ӧF)(��[{mHFgN�B�Ν+��?� �<�7o۷oGAXX͛7�ۺ�)����ѰaC*U�$'�T*��f���<�)�裏:�r4n�8�.]j�P��?�Aۑ:�P�^�J�p|�ŵ�r�[e�&N���5#ʜ7����}�8��+��"z!!.��
+���fy�K�.�IR
�W�Npp�s̝pŽJ��n��G}t{<:>nz_���?ॗ`��[aCF2d�*Ul*���cEA@@���$N@	1b����ѝ
+E�^!8v�If���93��]������\�w\�-�mɅ��IJJ�����A�Z-��:C��y+˶t���&m)I�7`�ҥ���2�>|�����n��6m�ia׮]�+O��\�~]�&(.7CQJ���S�N�U����t;##�)S�ص]����#
+<P��H>��Nv&�z���4i��z��Ϧoߧ�����ϗg��Gjj�=a�Z�w/��i4v��`p��
�S}���moe����J���y��	j���#I��_�
+�����t�T���U�<䝼�<������ۓ3����<�����];����_6����6_��^YYY����w�<��uV�T�T*���:��ݧ{��,[���EjH�e8�P*��I�������iٲ%$&&���L�~����#--��5k�(�q�o���}�V2��J��I�n�jɝ��_��yX����|�g������|�ڵ<���E۷o�y���ęWN(�⁹ZZZ����hӦ
u��a��ͤ��ҷo_���9s&�F��J�Ž�՚�5kC�q��:~�8իWw�<��Փ���b$����H�ͮN���8k�k�v�\���c��g�݊��U���~$%��@MHH:t !!�Լ�U�:�P��ݽx�"..�">�9��	�<��>����yy�R�W/X��2b$&"�h����餝���m�6&M��رc�Z�*�'O&88�={�0w�\
D�
�����W_-�^���ϟ�ب
+7naaa������ƕ+Whذ!�$�g��5kvW
+VIe
u��B?�D���NIAc��Tt?�yY��08j����t����,���z��ma�
+
+"""���TN�8A�6md�J�v�Bp��
*V�HXX������ӰaCt:{��-5����Q��Q���iذ�C��
��Ba�2l�x�h��NKO�n�딄T�(�^s�O���7�S�b<^6�޽�������w'�����'�7�R��8��3ƌ���8����n�;J�u��bbbHOO�?;z�(�����{�Nܯ�2e
+/������67=��$�+W�_��k�����,�4����~���������bcc�>}:����hт�u�r���b���?0`�*T�`�>�/�������J��]+�Ut;EC�5�b0w��$ߍ�S�)�F����U?�7-��k�/_N�nݸt�+W�d������O:ww�R{��.]�O<�P�W������"fx�V�Q*�(
+�Z��d(�YXX���;cǎ嫯�B�T����X2y���քI���s�t@lܸ�={�����m�45B�QX�Iǎ]h��a����_���[��C5�g�nL�P��lN@�2&�����'���[���23�Z@7�ЬY3���s�	'JP������~�رc�L�0��s�N�C�
l�Z��6��~ `�Z�����͛����ŋ�z���қ��[��F�͜9s�={���
���h�W�$3�l�X�4��>�$ʵ$g^^��K��Ν;W���\�7�V�T���?r��ڵk�~��|�s�N��ԣ=r�{s��q�u�$IT�\��Ç��9r$6KjW��n�-�~�z�kSJJJ�1�E�.<w�BN�8��-[d��@[ǎ���&''˵U*�N����o���F�$4
��&L���D��rJ��w�B�HO��o�[��#I���Ԭ�������gqMj�bcY𹈈(��=P�2���}��Zx�9}\���o��i��Z�7�����r��������%����� ���O�d����w�xF����믛~n��=��O(j�]�O�{�v���'/+((��ח�۷3l�0���HOO'!!������_�}%*�1`�9�=P\.�	]�#CT��C�B��'@Yz���)�K{aa!nn��*�J���k�.5j���:���S�2r�Hf̘A�-���`�֭$''ӷo_��[�1���ϧ��Nɡ��.���ՠh���
p��
�ի���+*�
+�B����f�޽<I����eښ={6�
*��W��S�Nv��./QAۊ`�(~�n�$`C~~11�x��x����2�����h��Ꮋ�|0����:�7�Ƿ4�x��۷����&�<x))X�6���߿�|�o�V+'W������rrr,�j�4�ƍ�����ă-33�#'##����ߘ�G�$o�����
+�B.�k�E%%%q��Y���w[}R��V5Lڜ�S��[o9�@�J7�U�>Y����\$I�]�v�ܹ���Ç���ETT��<����^`��S�`aX��tdff���������ҖR�����d����r�J�֭Kݺu-h+++�B)pss���K~_XXh�`�4󐕕Œ%K���Dl��d�>�փ�<�dm�D��������)((�����σ$I����%�.�j�*Y��<�ԧ�΃�������M�m>��Sq�p��QRRR�ر�U�*�>wB[��Փ[� IDATW_��Z5�eff���ib���˳H�h���yP(�EB��u�l	+W�CJ�Q�y��̴0V���B�}�]Ə_����OZ��"���}���qss��ߟ��222puu���V8�J��H�h�fk}2����|��1##�0v��;�S�MԬY�V�B���Ãٳg�R�1bM�4a�֭|�I�\%I�7*�Dn�R�&�{�z�/������Z��E(7Q���4�]{O)�+W��]�v����e��_�>)))9r�����BSLLBΜ9CPP���Ԯ]�3g��B�`�ȑ�b:t��,C�9�6��eQ'�������s��y�W��㟓������c��{��VI66��gff���Ɋ�ʕ+�����ӓ��D���iР
YYY$''S�~}Y�0
g�B�
+T�X���bbb��Ӗ��_�c��\�|�����X��
m=���+p
��� ++��c���o����l��źuJ}�+V�����+���_~�
��� ##%��Zrr
+������T*ˬ�j��Š46<x�ȶL�>���t:O<�ժU����HMM5�>,,�>}�����7��P�ռ��&���!ӧO';;�W^yŢƂXaa!�N�nb�̙&ɴ<<<6l���i|MZZ�.]21�Z�ʤ|@�J�x��'���.]���6�j��W_{M߯R�/�X
+���>umۢ4��Z���哺���x�
��̘1�D1�$�Ν;S�N��5k�p����޽ddd���m1���C����ŋY�b�	�T������SXX�k��f����PF�a"��K�$�u�&'i}^���d�g����(��/_&!!��G�r��1���x���M�E�Y(`���'>>^~��Q�n�Z,m͚5�D����3QT
+
+
+,���|���V�e���r����T���O�R�T���k&
+��}6lH�֭M?� ��6*'��h�>}���K�D�������-[,����3���F����	��M��Z(rt��A~��O?!�`������QXXȫ��jB��g�6y�P(L.��j�>5~���JFF*��
��_�z���̹9]$$$X͢��Lu'%%�T{2̃a�{�9��8���8{�14h �u�V���L������g���#%	�̙��$BO�@|���d$&�
C��o��|�|>U*/���	mϝ;���1f��}q?s��)r6o�̩S�,�Ã61�̙3�d��t�R���P*�2�ԪU�.]��ל9s�5k�X$�6�g�̙cax��GM*��ر�Ç�<`���w.�KN�"{��J����i������\"��h��"��~��k�$����g@��y���>77�+W�P�V-T*�$���N����P�,������ 88�e˖���N�HMMeŊ6�<�CAA����FGIxg�U�H�u��Ѯ];��
+
+puuE�T����e��޽;���O<�!!!�\�!�;w6yfq����D�V�l6�F@@v��/����Y�?g(�>��$�/�g�ܹ��X��
+*0hа�zƴi��⋯�}^^���+/���IyV!11Q:�j�k4��3�0w�\�5l���ش,߱c�8{����xGP�@������� ���cZ�ɸ��0>>���׳m�6
+͛7���f�}�nݺ��jddd0{�l^z�%�=�����)fy��ŋ$&&�ԓ��<���ä���"l��_~�����'��X�䲖5�7��Kp�Z�n�G�@�j��sW<����I�&1a���i`` ׯ_���_�΂,*~�Δ�E`ѢE���v���T	�rU���x�!�.�m�
+�؟����V����ª�e���q��Q6l� ��j�
+!X�~�܆��t�$F�V���k4����$��ݻӡC$I"<<�B�7$n�$�…r�zG1$%&&:L�}C����oI�d����W��?~�8�֭�q��h�Z�z��Ν���W����rS�UѾ}{��Ç'$$I��ҥ�;w���;��ݻwۼpq�3g��+=�z;Th�
�v�
p H�DŊ�y��q���V�
v�s6`��?LR�Q���r��Iy�	Ç���S������Q�y�]��Ƒ#I��J�GÞ�D�����8���Z���js�f�.#^r��Uo
+֯_��N8��0xR�����e
�k� =]_2�����A���	��u�{g>�r��P����֭[���y�{R5�":,�/P�DžbۦZ�
+k�����D~A��r��a�̙#[ʧN�*+K���;IIIH�D�z����G�$����ѣ��|���Cv��T�5j���`���r[�����9"""�]��C�RZZ��#
+�5嶤���q���O!,`׮]!8v��&'��i���W�F
9Ԧ]�v�T*e������R�J2�����I˓�����BA�n�8{��]�5T��ˇa]>��	��Y�:�_�ƲeKx���\�z�Y���ى���?������&""�Z�����I`` 5j�F�Pӈ��F0���Ӝ<y���p�����=aLq��_�������hX��\�

//�o7o#��l��3g,h�СC�}-u{ҍ��k�g�>��3kժe!�M�>]�PVm��ӹ3|���/��Z7\�K���j0�rҎ�P��#,,L�PދК�5��1\#����8���#��c9��B�B���&�@�����3�ț�/�(�a���DFF�:s��'�#mƎ��H�D�>}��sںz���dHvc��a�gB�i�&���+��N�A�a�w�~�������r\�$I2mGOj����N:�l�N�#55�n��$I,J�%J�yq�#��{�N���7_#((�ɓ���$--�y��JaaN��W۶mx衦&�m�����hZ�lOǎ�쳉L���=a0Z�x�M�W�J���"�J���+��SP��^�7K4f��+�B�q|���OHH(3����Oll��g�*U�s�DFFa�q-�>�͚5�R�J6}���7]�v��3�J�Y^
+
+�U�V�5�T�V�.U��I:N�6mL����2dH�����$�$}%�U�nU
(
+P���Q�繺����O�tLm]A����D߷9J�,���\Q�0��������'...�������ֻ�._�\�i�>}:=z� 88��+W�v�:�_ف���&
9D����PIt
+�B��i�I�r���B��өZ������y��߿��()����Mvg�5賎egg��ၫ�+h�Z������e���2��1c]�v%44�5k֠�jM�GyTB�$&&ҲeK��#�6m��퉺u�r��I���WX?7��>�	����;i�,���d��+#�����(��œ�s�;���k�$�Β|Я_?Y�x�<M�c^ϟ��@}�����!!з/L��7�S�P�\n߾�G}��;�B�V�}�N��p�~ї���?����{�6
ٸ
��Vq�4(�`H�]�9MܷBƍ'uzz:o��&Bv��I���--RV�z�jfΜiua!X�|9gϞE��Ç��j��ŋ���J7dggs��
Y14��K��s�='��w�҅��<C���VۦċҎb7Z
+Mr
��8{xx8��/I�(�bo�y���/�X��S�N�n��V��
RW�b9�^�jB[��}ooo9ǂ$I:���P$I�}��t�ԩL���j�Z�l�p¾q\G��'O��_ٵ
#�����9��su̟?���z����kvԨ9{6����y�u� ��։"�@���u�����Q�d��Lر.^�+��Tnʿa.�L�b��!pww'??ߩ�;��=�/�u�C=��f�=��cK���u�
���vm=��ڴ1�ƙ3��5���ҲeK6o��c�njÁ�ꫯX�l(QI�ر#C�%((����o��K�H�DLL;vD�$\]]M\�kժ%'�	

�J�*�>���ݽX�+�j4X&E(��R�S!$����ֹ���[�kOff(/t��˚+���nP�
��j�ڄ�T*�쮷x�b9^�ĉ̝;W��_�U�w׮]�S���VoHp�P(LJ0լYS�ba�)���.]�0
+�q��������
+P�����ĉ'�p�gΜ���	!�t;�s-�ql:bbb8~����Ο��B!p�l�}>_�
+�^`��QQz!��/�.�K�Z�mժ�����/,�A
�ٶm/����w��-�V�)t˹>�}t�~���'���/��*?�{�������z�&Iz/���j�>lj!_��<)E�['������pel���,\�P��j��۴iS�䴸I}�7�v�şq���:9�$�OW���ϞD��U+�s��#�����>�-r(:0d���9���A!����Ȑ=;�,Z�H6|����I�4
�}222���>}����8P~�a�lro�`^_��(,,����5::z��m�QI�����Pe#++�E�����_ѹsg�6mJhh(���$%%Y��y�=
+���-z6tJ��Ν{��߫���F��N�8���_СC'\]ݝU�:�رc��+��	�C�[W��jVc۪B�};�;))�2Yw������Q
'�-ZX��Ǐ/r:r�ǎ��<�i����/^�)���䰴(#Q9�k�n�l:����_����
f8w��w�9�����w��
2Ktt4O=���
��o
�J\�
+��öm��mX���>�8t�fz�r�^�zٔv�����￝��S(8}�4��͓�'O��O����K��-���/�$<<\6 �z�4}<����q���+sT�T��
.液~wzj���\����ׯ�F�����1c��|͞=�˗/#�`ժUr鹀�ٳC�$�z�)��=<<��}�FOOO�b��WBP(:tH>�..��-����777��f/xxxP�~}���=�J���5��7nȴeTPP`A[���H�D\\�\e��Ϗ��zJ�wϞ=Y�j{��%33�6m��e4?��C�3�8a?��?�`���ԭEtt�����ﳜ'���:c�Ӳ�ѣp�$<�^ ��#X��4Q�1�W��H}�?�I�#�ܵ{�ڵk�nݺ����^��q����̴y8����nq���2��QZh4�l���v�(c���$Y18��=z��_�|w��q/^̧�~zG2cbb�
+�����м�-^����5k�a+V��HN֗N-'o�M�6�t�j5ɥɗ� nܸA�ڵ�r�
+���ԯ_��u�ұcGz��ͱc�dc@I`jj�ɉ��٬:
!>V��\����{	�A����U4Ħ�ey��|!���G��ɧ�Ǐ�Ok
V�^�z��u��B~~�\JM�R�F///ـ!I�
�bE��\��Ba�]�6...�F�L����iK��"�����
%Ǐ篿����X���˓����Ȇ"�
+/u�
�Y��%I">>�޽{;56'd�<�yΞ=����ٴi6l�̙S�[��˶%��O�5������]��t
��'��jjꭓ+��E6�ɿq�V-��^��i\r‰�lOy��7Y�|��w�Ǐ�駟��~b|��9�w�߻�t��VM_:�Ih��z����
@��q��yc��t>|I�5j			���ϥR�J���^5;�}�5ɺ%=�ch��m�"Y(�%(�[���S�ZLsFF����T*ҍbv<HAA�����O�>͂���߿?
+�B>-���B�$�իgRS>  @nG�ʕ����B�
+���Y���bVVc���%+r���6m*'�t���ŋMjޗ/��j����I�V˴%����'?__5cٲe�ءO�y��9�R*�H�D�=����ڵkDEEѳgOY�2ηP�re9�G�͘����0��y��g9��S�~����c�_����,�իO�֭y�ǨV��Mx������L��{����Z��A�R���V�Fp��ha��Q)%%��ɿ���G}�/'�����]�2i�$��-Z${ة��^�j���Y��������S� 1bc����=�67$���}k0(YB6'��w�%66�.������J.n���p3��P����{;�ʼ�������L�͛'+>��͓3�F#+x�$�'�������!+��x�ڵkӯ_�kʛ�V*�,]�ԡ��3gΘ�ٞ�>  �
+*��a�u�޽M�

+!ضm�\e#;;ۄ�V�\)ϯV��J[�$1x�`<==�$��ݻ�$IԨQ�D��h4:t�!^�BA۶m9p��S�v���\ڵkO��Չ��ǠAOs��J�� ���Xjԯ�?�o�@/��~�/����9l����y�]O�����&M�c�����륦)��~�J��y
�m	[���t��t9����#��4!+�$��[o�j�*��ƏO\\���[�X� �R���Q<�����K��������-�~�n��j�4C�;��%�dp[h֬k֬���t|�y^y�+���CCu�E)<n1lIˌ�&�y)L6w��W�\��å���/;x��e������d��ݤ��ҽ{w
+
+
+X�x1�<��/AOŊ�*#����%�8���ӧ�^��C�ܸq�麨Z��$���Gnnn����닗�{��%99�=z�R�X�p!�
��?��e˖&.���1�Vyϯ#�Q�Y��ڵkS�V-'s~@aL�g�c���Y�x))�dffгg7>��+""��3}�ׯ.����0�:��qm�+W�J�^3��z�S���G����VkK�J�P���
+u�ؑ��������ddd8tHIq}t��ׇ�����QZ|��',Z�H��f�cǎQ�Z5<==��
b\����SO����K���z��u_Ў�p��W^������
�
+z��y`e漩K�hcb���������T*IHH 22���8@�ʕ	���W�X�g`�����ãD��6l >>����[4.\H߾}KT��_����0�,YB�:uhذ�l		�#�B��?�бcG'ӖGy��x,��BݢE��������#88���+N���V-���g޿R�146?yy��z�%�ب�`����6m�U!�!UJ�ҹ�:�������Z�7*T�`�d�w���u=���0���Bش	����ay�5(4".�@a���R��:�]I	�.]�$�������
+I��ץ,����:I-ߧ��+:,�4��ݛ��$I�Q�F��3(h��)on�+mLsI�l
�2�h�KYeG.m�;m��^�*���O?ͥK���?>yyy!X�z5;w�D�ŋ�ru�z$I��'��aÆH�����\�Nh�(㒽�觟~r�v����>���N7�����޽��c_�i��!x��wpu�����ĉC�A*	�6�֭��K�1������%+�ժ����O����S��( &''�i�&F�mU�OL�'�t*�N8����`fǎ4j�___�k222�i�j��.�[����
��w�&��V��}��U]BBn����\/[��z�9�\��x,X={�䯿�B�R1d��\��7�|CTT�[��B�
+V�]����Kll��T��
��i�F�!55�jժ�y�frrr�ҥYYY,]����ˊY@@...dff"�����ZMvN6[���1P��p$$\����������]���N�sss�$m��]�vѴi�RLJ:��;w.�[��jժ$&&���A�n����!!!�!C��H[�����?{�Ź��٥# ���D��h��k�]L��D�T�I��fr5&�X�k,Q�X��FEA���",,ly���R�6�8�uq1�;3o{��t[�rY�jt����K�
Z��Ν������+�s�c��ᰶ�•+����[����~��b
PX;s�0��;�L�;Z���ـ���"��d�jbbR��sLL\]]_����M���v�6����̳
+��F/�V�Z���͛77�m���Z�.���)0f�Ί��h�B��B� .P5�E���q���Xz8oooL�6
K�.E�v�0e��������V�*�]��֨_�>.^���'ObѢE�W��7o��ݻ#22�%+((`��9��ٳg���"B�>}0l�0���ۛMGGG�ngg[[[���)�. IDAT��ZW���m'8��	�n��5������5
>rq�*˱h���ڵ+�r9���
�y��Ʋ넄dgg��8ܻwǎ�qP�T��M��f͚��ЫW/�1�e��9s�Q�����rY����\�ԡb���d2�X�q���W�[�ŀ
o�ysw�o��G���
��…x�(���ӧ����5]d}^cӧ����������BkD���ߺ��_�hU���4W����8�d2`„	�`^���blP�p��Ŋ���zXUW����q��}A�:##CPm�>����Xl۶�V�188��t{���9s�T�\�S��o��8::�T�666��k~~>>��3c��������n����d]���,]����u�a}k2��Y�B�iiie���a}�����~��Y�����ѣظq#�;///L�2A���y����l߾...������\�v
-Z�`�����.^ZN��2U-�����(�v&��m��0]`�a����Nt���J�	��������חm,>>>P�T,�ݭ[�@D���4���WթSfff "�m�Ç��ԴBYJkӠA�D������EEC7oެ�PEi��ŋppp@�����ݻw���"�t����6l��g��ƍ�HL|�M�6#??����hӦ-
P{����`D���´l	��3�,O��	t<x!H�0�0�Y����b��	�\///������/�o
@||<����D�nbb"�=�*aff&��#�q����LKKKA˓�d077|~]�����4˧î�����+DDD�m۶E֊��4�����ۛ�~i��W��.u`P�n?��*����Y�u�ۣZ���W��y��8�R�㕲���<<<0n�8,^��ϟG۶m�������2���Ӎyyy���u��)�p��/_1"‘�_�ص��h�YF�ab^��xUL�_�򗏉�a�v���@�����y�B
�����7n��88;;cƌ���5kLMMAD?~<:u���p��%�r>�<ԭ[���ծ����"�2nD�w�yGT��ҥ�=Z����A��������S:7�'N�o
�:u� ==)))�����P(���� .<y����h���!<�
Ξ=��um��ּv1����<	����а�����2*JwP3��Æ�_�N���;�yz��]��ӧOc�ԩ�h4+�޳gς�ФI�*�[$H�P{�*ܽ{o��F�BBB|}}�K�.�H��*���n?h�B��/���/�
#FÇ����l��ۯ��N���m'O�����W�`�=��۷oZ�j\�xYYY�޽;cƌ��M���憘���xD�����6BC�������� �!�X��:`ǎ�ӧ\]]���T�=
+�{����ٳ
���c�}��L&ÿ��/v�?~<{��
��[�
+�ѣ���`ܸq��ԏPS�)�\�D�0�����gϞpww�իW���S�;yyyصkW���ӒL&Ð!C��->�Fq��.*
+���;��c��HOOC~~
6�÷�~�e�~D�:V�[���	����J�ɀ����[��N�_�����Z0�8����}�y���}|����_J�'A��������[�naذaE��ӧ7n�V����}�ݗ�����1��Y~~���Ѻ�>��pO)K�5t�k;;��2+V�τl?�h�_%"嵰Z���Έ��BHH��憻w�"88�A+[d�6m� !!�F��ǡ����koS�\(q�|Aښךfff�޽{�'���xVV�����l9~�8>|���"���j<x� r}�F�����ѣAD�����ٳY�����I���fAMLL��5��f�7�����q��e�,��!((�i�+��-޲�ٳg%�։'	����'O�C��m͘1��� "���cǎen%і���-�\^!�""(
+���Cb�_1������6l@^�����;w����n]�r�G5�.&&xq��V$3S�S[>��x`�(`�`������5c�?@���Z��X��ʮq��m�w�
�q%f������k�}��l�ؠ�hjd�VL�yyy��E�ncI�0�s
�LU������
b�С����ѻw�"�=}�III�_�><<<���ך�Q�??��
WW࣏c����ۏƎ5�YY/���8���=���nQQ@��K3�rGUjq�8�f͂��O��#/'�l�/Lo�A���u���E_��j�*�$�|BB������o6n܈�3g����w���ɓY𻂂�0���kc#�Μ9������v�܉iӦ�*ǼX��|=rss��]ӏ4[ܘ?}��N��;�@g�3c�XXX`Ϟ=�4iR�ik��ݘ:u�h�*((;v��B	5�V�Lg��ahР
ƍ�����������%�t���r<�&�.H��x��	3���h�ė[����Fnnn��Ο?_}�����}��S�
+�=~�NNN���T*�u��j���[b$����C�� ??����bncU�
�AVV��V]�5�Zmp�*	���CLL���*7霜�"�
+�O�>-=�A��0O�����*ZW{�{�$�6m���#ƌScu���{Ą>
����oz{|�;�}�(�W��h��-[<x�f͚���
+			��"++/^�ȑ#
G���
`mm�K�.����:u*���ʃ�X�������K4�gg�j,����6m
+kkk$&&"??...���F@@F��h��7߄��
ann��]�Vm�1UaRR0y�diq~�p��e����.�G~�
+)))X��|���/��eJ
+РA�������́���9#ѤY
+���
+
+b�`I
JG��C�Ys%H� �:�������G����%j潼��l�2����K�.��Ux�:|عSw���\	J���N�-	j�q������!`�?�v��Ͻ:������K�0\���ʕ+x�7۶mC�޽Ѽys"11�Ǐ!//�Igsssann�\���|0�P���SSS��ۗZ�W����;v쀷�w��Q�uPP^�u����ѣGxzz��ի����ĉK�-???>��O�,�Bu��Ǎ��4�^�u#;;vvv���/���_�H" :�!ڵk�_����˳��;���m�~����`L/����]sΝ;�	&@�R!;;���������?�AY�	$H���
+���ٺU���`bb�B�j���gII/����	�y�����&7:	���_,]��Z�4��?�������C���;8�!33���L��֭[��8�={���pwwGTTbcc1`�h4<}����US���	AM�ʂB�@||<�1��Çh޼��k
=�QQQ���B�&M����'O��U�V����� �����xxx ::���8p �Z-���UAEh�֭[#b�ٳg1p�@Qm�.Ě5k����-kp��)9R4u۷�~��k7�8/FL��c{��qB�16��t��a���cʔ)e��O�2�v�*rV��j1��ԯR%���q�p�С2��C�!33��K�c���H�^Qr����5����0���*lF\�݅��q>��gς�8$$$`�����`��7�;d#J䃃.o�����yxx��8�+�����
@D���hڴi���Q�n]Q1��.�Z�-DU����j���h��ϏL|��)�-@���'uvvF���
�������0 "���c��� "�d2���T����:u]j�~����.|����{���P3�w/;�-v��m��/m�KӞ:54o�ׯ/�����8s�Q��_3f&M�T*�ODHKKc�?�>>#��m�~�:n޼)�8:88��S�N!22RPz����ƍ��&M�گ�?����m�������w8p���-��1c���w�)Ѣ�8���������&(�ddd`˖-�~�Μ9�6G��0q�DL�6
��ӧ1t�P������%.�q4h�
!�X�k֬��������z�{���
����ڵk�8999��8'O�DNN�o��c��6m�9s�0f����
�:V�to��ڭ ���p��E�IcaaQ�}y�e]�oJ.�����İ��h4Eh�7MHH��+W�q
+N�<���ԩS���a�ȑ,"t�ƍ
hk����pcff��I.��xA[�;���T*E#2�������(��0h�@�:u��5�…��[��ͭ��2�@%$�Z�A4n�q;r�6oތ�{���8\�~Ůy���c��������2KKXP�Ղ"�G�J%x�"b��BAh�)<?jc_U�g9;;;L�>D���p̟?�Ե�?c���X�n]�k'�Y�T
+ڦ����v
 	DDdjjʮG�I���}������Bj��bcc�믿.�y�VK��)��‚��ŋ�i�&R(DD��������'�FCDD*������gc��jIU�f�i�ZR���~Ou#66�222DU�]�v	VV�q.�z�ڵ컭[�RXX]�r��Y��V;m�n�:tHT�Q�Tt��}Q�7�LVd�%�>��d��sS�ڵ
%$�>�VC�~�>
������=�&M"���-W.�Z�����رc���7ߤ:u��q�J��������b��� t�^�|��^�*h�B���Ϗ���-3##�~��7A˴������8A�f5�H(���,�j�F����E�V�%�RI˖-����������f�#�&���v���~�!V�Z�_~�r�NNN�J9��V�aӦM�;w.�w��L2��G���VV[�qLL���r���L��2�|UI�&O�����2�$��!77���033CXX��������L��Ƣ}���8�O�ƀ
 ��q��%899���qqq���A߾}�v�Z���{�ݼ��_�G���M[�1�j�F�-*_=�d�
+ק�@�
+�����ر#],��m����aaa�����g�͛�7ndB�P�`m]~~DZd��h��E>����I?��Z�*�+*U
""Šh;��Ԍ��T�"0�
+-�x�;��l�A*f�����Ç����)))e>;u�TXYY�?�0�Z��]�	�:�Q4�i�IN�@�����2�ŋC�V��_-�^�BQ��tݺuX�`
�P�b:H���̌]O�>�222��O?�ٳgSDD�ڵ����cԻƏ/����>�V
+b��1�r???:v�%&&��a��ZMj�Z���hJ�Ɨ�������(77WZ,��i����yff&�_��}�a�JII!"�Ç����ٽ�4�R�ػ�j5��(��˗h%�^��h4�T*)77����]s*���p���SD�`�vOLL��off�t�ʕrա�,��<�>5j�������ʎ��}HW�\���f�yBZ�Z��Vk�������������[��V�����RJ��{�l��
�SJJ�������$�qt�j����ßa������ �|u���ւ[�����u����ŋ�&�z���)--�T*}��������ݻwW�,�:���C����c���-"���x
+f�RPP���͛�����u�V""���%v߹s��ٳgF	
+�j���$%%Et�999�b^Z7�[�nQrr2;�ܾ}�222H�Rх���ϟ���T""
+

�7n)�X�Pyp��E����EEK�AA��n�Z��_h�v
+�W�����Pp�M�t����.�P���)M�<�=3c���p/W=jB�/D�
+~����i�ʕ���\���?�N�2�-ZD999%����(F�m��:qϏW����V��
�A�ޤaÆ�;wn�����Cvv����$�>JM}J���K56>DD�|�	}��g���]�������!	Jf$�!��~�8N���F]Fl۶m�5kְk
+		a��
+���h4㞙�I�=*�)��D:�T������}���Kׯ_'"��w�2�V�5�5���k�RI������ؗj��._�,K���h����z�N_%���ji�ΝԡC�?u�
���X��
Ѓ��!�)��<�鴉&&&$����K� �摕�EL��j���+��_�f���A[.�Ę3���#�=V}�~�x�Ty�W�LF2�����/�YLL������#)+V@i��Z-�{�=Q��֭[����#d�uPP��y��=<|������ׯ��_�p
��EB~��8�C\\fΜ�|�xy"�;＃֭[�w����϶~DR���)�!z����UQ�/���	չ4�?�����p@vv6�����W�^E~~>8��?�����p���T\�|��3OkD��ӧ�k׮ "�m�o��6�%ӏ͠��/��`nn///��"5�u�el����F���Z��c͚-ؿ7�D��'�p��Q|��W��5�㐘������1?|���ϳLh��n݄��
���
bZ�����S��`�ҥ���Ѻuk�9�V�K�w'Nħ�~���T6nZ�V�Y� �@�TB�T�O�>�-�:w���)��ٳt8�~�����Y������(�&,,�h��W�^�ѣ���k-aaa��cG!))��/~ɒ�prj
+ssS�=7o^�;oqطo'ڷ׭io�ٟ��g�իW�S��03��C�����\l|���i]|*>�aɒ%��ϰx����y���dz���_�?��
6H1$TÇ�d�*��ei37l�@���DDt��Q����d�������-1jBs*&�	1Zo���W�OyIc\�������_1i��{����)99����)))�T���4�Y��j�믿6� ��࣏ޥ��ZR��Z�f
5l؀�����2e
+
��um��7{�E�%"���SϞ��<7}�0��QZs"�ɓ'ט@y�
+
+����w��	��X�
�6J�Z[����3jР

ڏ}���&++�]s�-23��ɩ1�l�I
+E6_�"�����ݺ�	�G�&���F���C2��f͚��ױc+jڴ��?!"�/����B�FDDqq�V�ZNDDQQ!daaJ&&rf
�����V��
��u�f��o��srrʽ6�������9^����$�v��0ɒغ�J�dqqqHJJB׮]��hp����ݛiQ===Q�^=DEE!'':t@~~>n޼��={�%��2#""���)�>ڲefϞ-����ʼn.{BY��__�t��PPP���Ѹqc���"55�;w�F��իWѫW/��k����	{{�R�.�
+���ZT����(�i�F4u�ի����;wn��;w��ϫ�����k���ː��d�V&**
+۷o�L&�V����o�o����e�����EK�
+:t��S�8q�w��¥K7�7s�T����ܹ�E���χ��;�<yRl]>��0���-[��V�^���h���������s��1X
+
+
+��O?���Ef����?�h4��_�d�dggc�ڵ����Oaii	KKK|��g���˗�|�|���$&&����8�<�w�ʕ���5x����-b�CCC�a�k���|�է�~Z$G�رcѯ_?�~?~�N�b����bӦMϼ��Y`��f�B��w6l@XXX��x�"lll�n�:XYY�{T*���8::�޽�͛7�nAA
֯_oP��s��'//��{�̙3<x0/^��off����=�P(��'���9D��s�m۶잵k�""" �f͚�O>1�'�W��Ç���[[[|��wppp`�|�����1x�o��I�&���Ν3������ܺ�.\�\n���iӆ�Evv6>��S�,@
+��7o.���j5���4i҄��~��w�R*���y�)��>}�`ܸq��3gp��Q��e2V�Ze0����g����]�t
���c�ԩ�ԩ��{6l��?���6}��WhԨ�nٲeHOO7xO�Ν����>���{X�n�,Y���<(�J�[�Π���}�w���`Ŋ���}�vaҤi�}��B�X�{���ڵ~�7�b���u��~�SǮT��?,ø��� IDATg�}
"™3'0d�p\�p}��	����q��AܻwAAWѣG/\�v���"�����Bjj���0`@_ԯ�{���~_��{|�ŗ��6m�����ׯ�ĉ/���?GHH(<\l]��d��J��_�V�^��D���Z�z��3:t��!CP�n](�J���O����ヨ��r��?��#rss�����|��w����ʕ+��k�΀��~�:���O��M�V�3|�A~qԨQ0`���_!00��]PP�ܹ#YT��2�h�ZJII��7����F/I�Y�:44�|||�}k֬a�mݺ��޽+h�;1K��(ɫl���+��
+�ښ5k(??��t��׮���BBB��E�U�ǒ�Ǹ��b
�>dgg��u���k0�22ҨaCG��XKޗ�ׄ|��W���]�\R*���7_Q��͋�Ñ#G�ܹsK,o�ܹ�q�C!�����Y��1111���Ĥ�ڣ;v�Yװ�0Kc�T�5��c_y-�J;���Me���>��ŵ��~���v��Q�����{��,���ߪ��ʂ���Qc^Ug츸8ڽ{w����SZ����;--�d2P��oPzz��*z��%յkWJ���@��q���`��ujj*���q?@��)��˗R۶�H�����_�<Y��G�
mٲŠ����,���	���nӍ����������辪�5����Gߔ�,�fWĊ���g��5���edd����+<�M$�IQ)��۷�g�t���Ǐ����q��A�1�z��qX�b��ӱl�2�k��wY[[�޽{ejۊӜ޾}����p��u�KKKܺu���hժ233�nݺ1
k�.]`bb���`888���^^^�����0n�8&���˗�cS�>˼o�n�D����E�Mk�[W�}׿�x�":t�[[[ܻwD�v��!;;�o�F�>}
u�����		����7o���LDEE���ݺu�\.g��|Y�[�F�֭
�P��%}_�q�s玁fJ,�b�k��x'�w�^lq	/'��oC�*��g;4k�u�օL&Ghh(�j�ɓG���ݝq��R�7x��"����D�ݻ����,�iam]��������h!���_�z�7o(q�lܸ�@����
___�蹴�J������7�0_��C���ɓF�<V�Z�R��c��h+����ƴɘ>��ZS����{�j�+O}*�}?�UY���]\yU1�����Ki{hei�2kEe۽c�&899���2���g���Ν����=�}N�Ə�V��=!99�J���u[[�>/|Nh��IO����Ϙ�6^&��iSg��W]kNq��;����ﾃ��9V�Z����b����פI(�Jfi�z��������X�ג��\����?~<Ǝ����c۶m�5kz�ꅃ"//�F�‚�������<`�N�?���;�}Ϟ=�ӧ7n�'N@�RaԨQHNN6�Էo_FH�9�nݺ����ݻ����;��)��ѭ[7�8qC�� ���#G���'8?6Z����[��Z-�r98���͛ѿ�������HII��	����;v��w�1����mll��ѕ�OC�&������`p-����>lҤ	���P�^=��џ��$�%`(���f��V����5�+	�NNN��������q���3G�FX��C���`ذ1���g�{�����0��r9�lY�y���q
+����,����b鲸u����J��f��K���J\��b�e2�r9T*U����[�	�//�"�N���ɓ�%>W��-~��7<{���#m1e�8��}��֙�-=���سz�17���;���`~�Ν�>&&:׈7nWX@U��?q����
+D�O?���{SSS�T�R�Ż��������o�x�8�ٳ�����NMC�u����ӧptt�\.g�3�.]Š+ ��ЧO�R��_2�
�F���h���9���/�A�eJ�*��M���c�С�J�9���,�@U2���ӧOŘ�g�b��
�8������D�
������d(
+����u��P?g���~����:u�0��������訤yS�t4}�t�����V%����޽{���׮]���<==�������^����B�����
6`�…�b_@Dh��_~�]��cc��_�Ç�ń	�Ѱa3\�t>±c' ��Ѥ�3�/���/ĝ;�P�4ؼ�����R{���lq��~�	O��ّ��8~�x�}���=��׏	�K�r2��̃���Zm�C]�R�ϰBD%jq�yyy����j�DX�9Y��:u�t�Σo_��,==۷��]�v�2��1vss����b�J,]z-[���z�3�7���'���O����X�f-�m�Yc�Z�=z���~�ƍ�=gp�f�^�zpww������[���g����u�X��F�%�e���H}�����˗���r���9��Q�>r��
�*���X|��ʻ/Wz
(��R�(7��тyc�Lk�ZR�T�������h���,�������?&�VKK�.���x�j����lTߤ���֭[E��-[����y��I?�b!��Q��U*��j""�����7��֮]KJ���N�r�Q�V��|U���_ttďCM�).*m�z�u-L[�?���T""����ԩSDD����h��Y2��l��R�	�FTT͚�6
҇֬Y�Go/h+<�M�6��M�H!!7�]ƤI�����hH�P�B�`>����� KKK����%K���8 R$w	R�
+�F-п�5�P�.ԩSk@m�x�Z�_�S�vm%{{;JIy����ӕ5�/3�'��
������[�wFF�#Ԥ�u�ږМ9ެ�j5
6�P�N�͟�
�+WtY�߿C��ւz��Hff�Լ�;={�U+i����Q�������(77�`/�h�c��𒇩S�⭷�2�PZ���8I�?��/���L�����%K���?_��S��̙���Llٲ����V�ADX�|9=z���u��Ŕ)S�2[�����\$�mM"<<� ���q�F̛7�Z��i�
+
+p��<�i�;w�{{{���"//]�tA^^���Yl�۷o�����戈����\]]�.�6��>~�NNN����ݻ1eʔjվ���<x���T������:w�t��
���CLLT*<==�T*�h+22-Z�(��y���bݺu�
+]B[��GWF�1y�d�ݻ�`~�����{�Ǵ*���8x�`��Ժuk,\����E"|Kf�$H�
+\�r!!��R�Ѳ�k0``��&%=Ap����@���=?g�"(�:
��E�ٿF��,�SRRt��ff���h��ǣg�>�̒���S�N"##]�vA��A��!�?
��w���#G���#�лw?ԭ[�!==~~'��Y6�5k�#�������w�څ��,���۶m����}��711���^���A��~�	K�.E~~>��8q"d2=z�&M�`�������k�.����~���e_~�%fϞ
www�?...�v��w�y��_�~LHн{w�ܹ���Kx���3ÇDZc�^�C�p�(ά�8��Fq�����r��rh4h4���A��`�ƍX�`
���}�􁇇.]���O�b�ĉ%2�p��Q�1B4��R�n��/��c]�b�
+
+��YPPSS�"����`x{{C��bÆ
x��w
[�nEϞ=ѢE�b�ٻwo��՚@pp0�����$H
+����J�S.����
+���HMMEݺu�]�k3�/�uZj�ԯR%�
+���憴�4v����NAA
s�!"���U�f��������DDD���3H�ajjJAAA@DD]�v50'pwwיp3����ڵ��ΝK���t��R*���W�|
+"˼����ͺ�I7��…t��}f�|�������߿O���DD���Ğ1ִ�e2{�h4���.:�iIL&���?~�8sŸt����0s��w���ܹ�\��߿OIII��ilJ'���yzzJ��Doo�J�S��~�-mٲ��l�b����ٳm��Ǐ)88X�2�y�Aˋ������Z��;w��ӧO-S�P����+���Xza� � �z�R����Â��p��2M�=z���;v��F�<}�Q��[��ڵ+5nܘ�^�4���%""kkk:}�4�d2277/������	��RSS��wߥ6m�Q�f�^)��j����*:�{�|ŕe����Ynx�FCyyy췼�<�T����l�JHH�͛7��6l�@���F1\B2T|��$PCY8�Ae�A<��>�����y/L[7nd�o~~~t��:p�%&&ҦM��*KHø�uX�h�tZ� $''������@���dmm]l.���Ձ���ӱc�-Sh%��˗��ի���~~~.h���o�	Z&�
+qqq�k�.A�z
�P=P*��l�2A��y抜ypG������`��+�ˋ"��O�<aQs322Ϟ=(
+�o�������ơC��0`������x��y̝;YYY�۷/���0p��W�D��8ԫW˗/70;�i̘1�H:#���!44�ϟ�q��χ��8��q8~�8RSS
III,�J�Btt4{Ott4K���[oa��� "899a��٬����#99�H��_WG����_������Ec�FD�ѣG�4]m���!  �A�R1����fꔜ��hK�V3�""̝;���aĈ8p Ǝ�R�9s��	������.�b��:t��ET둄Wvvv�&�����?����'�lق��4���#''-Z��:P�	$�<aᳲV�Ezz:���������Ç������
+܋�F����K�j���E_~�e���ҥK)++땓J��URƲ4���rrr�/(( "��ڟ���jÆ
�m۶QDDD�,j�����|߇��UۻKs�Je��$ںw�������ik���V�Zy1������?K*	��~�N�:��5yY���d
 Y��*��Y6
+�gϞ	Z^JJ�d
PE���ŋ��ё�u�e%I#�H����X������̙3ADE�+,�={6lmm_
+�SE�X�3|�[����O�ϖv�q���o����8�;ww���q���C\\�?>>��ʃ��h߾=�M�����C&�a���LK;s�L��f�i�O�<M�䚰8(�>Ǖ;�Ci����n`�q��a����8�?w��
�q�����Ǐ
h�Wbb"._�hӦ
�O��hU�����Ѳe�j����<9��{�H/X�X�aÆؿ�$�� :���?E��$H� �6����8w���.^�X��Z�j%
vY����!>>�7o�p�JYUW��ã̊p�f͚�4�9�q�{�.<==��䄸�8ܺu���pvvF\\�Z->��xzz���/�]�Fxx8bcc����Xp�-[� ==��رc8{�,8��ӧO�u�V�@�=���,Rr�v�@Dpvv�k�����g��7o�z��S�~�"!�a\����jEE����!�O%]+
+@NN�j5@�T"77�.[Bvv6[�����8�8q�N��qppp�ȑ#���[o��Ғ�G�@D���10�mٲ%����В�B������8y򤨄7�O�fcUS���ӧ����.+A����LMLL`aa!h�B���̌eW��m���<��L&C�:u-�I�&��'��aiiY�i���VVV���
4�<777��[[[A�lܸ����R�d٪*��?��G}��+W">>>>>����ʕ+�={���?�ҥK��?bʔ)ؽ{w����������P��bРA�A�j�
^C �@)			hڴi��7���رchժ������2*�
+G�E���aaa
�R��
���III(((@�f͠R�A�Ilt$�������ٹ��_�uaf�ڵkX�`
,--Ѿ}{�_���ה ��P8
૸NHm��(�����l�ԯ�vM ���]�r%n߾�>�~~~����?����?�G��V����]�Fc�
�R5�B.�M����'�����\
+\����LUa�K�V#77��Fff&����qrssq��=t��aaa�}�6�N�
+ؼy3^7|�p��֭[�u�� "���b̘1�ֱaÆ�������qظq#�͛'���ۦP(ט�V�
+��
�$�R(����J�2����,��ڂ�8�߿����֭"""p��
L�6
�o�>,X�D333$&&�M�	Kx!67/��R�~��X�����n���1r`����ٳg�p�lmm1o�<�������S�d23�vpp0�X|||J�Ph߾���?$$D�X�����������I�_��B
��p��Yܸq�E����d�fdd�w����{�� "�j�
+S�Ne�7r=�N�0o#F��Ś?������E|������~F[���Gvv68�Ù3g���@�	����ӓV�a����֭�����6m+w�ĉ,rzbb�
�=z���Ң/A�	$H�PK!	�Ĺs����]�vؽ{7Ξ=�E��]�v������1h� 6����������i�������k׮0555��*����q�RC�P ++�]�18�Î;�����ӧO3�~Ȑ!���0a���AD8p �v�
+"���\\\X�nnn̼��8Mq�Ǎ��Qh_Ach�O5Y��K��(��Ϥ��V^^�
m�����Çl}�����a������Ǐ���
��
bs�������%����S���C��s��҂/�DDD������3ŁP:�G^^K�Z[ۘ��c��gUB����@dd���T*�ZZ��SmW7�S�u�KKK�̨�(��}cy!�0����X��&M��ɓ'���h4��������|���.��>|�Z����'BBB��#GB�V�����ڵ+�������������4jԨ�'T���@RR���M#44��+��,�,�z��!���!��p��xzz�e˖Cdd$F�"B||<��OHH���=������
�RiF촵`��_�^�Pc���������#::ZP�)���\�=z��6��
B!33۶m�| X�r��F�����p��EL�>���ν{������C�
+�ƾ��X�n�`�5l�III�
+V~��,[�L�2���椧�c�ΝX�hQ���,�\��"“'O*ɱ:y>J|e�‡��f��&�G�/((@jj*�-%%Z���СC,�\dd$����4�۶m3�\���	"B�6mXT{��:?~>򪃃�
�Ϗ�1���vWࣺ�E�׺uk���_UJ�ei���=�i+!!
�?Fjj*��Ç3S|>�'?�Ϟ=�L&aԨQhٲ%s�������5m����t5�#��-�F�Z-
+����~�z�d� A�O�Em�)��j�ZRSm�^����B��&��� x�
+�i�U��m�$�pa۶mE�;"b&���_��S�q����޽�1�v�bL�J�bA�Z���?oRGD3f:v�hѢ&M���}����fث�?�D�4Z�t�h����Ka��8���8s�8�CVV�
m�޽�	e�j5�-"BAA
�6m
+333�T*��/���ɓ'��:u�T�X7޵D,�Q`` =z$-�$H� A�	��@$�6m���ϴ��Ő{�G���Grr2�J%�ٳg̯&//����}rr2ch�
+"���=�L�˜��S����P�~}��laaa�-urr2����J噲�f�����5Z����������R
�>�?��Q瓓��hvv6�Q*���{�n��W�^4h�vvv�5e���ё�477gq	�ׯ�ƍ�/_�})��0l�0QE��޽����$H� A�	$
�hQ�a�$�����q��u�5�JL����@XX8�CHH�j�C�V����3f�0`�4h"�����՜V���8�o��I�X"����ѣ��.�
+�x��h4�8DHH8�Chh(8P�1���0��)S��Q�F�pW���P��!��1r����(�Z�� �3_��n��Z��_��J���D$�&tӖ� IDAT0G�V��Jk@�B?(��L���B��!tPN"�����Vqqq���Fbb"/^�ٳg���...x��)��r߾}���*��ɓ'���III�\.�����󑖖ƴ��o߆�����q��Q4i��:uBtt4nݺŢ��x�e�u��t��ATu:q�\#�\%-D��
+����
+�LV,m�ڵcƌ���%�?����k׮������י���D[			ptt����hh(%%prr���cղeK���K��AQAy��j���/�o��F	��x5�Xg1�v�	IP	?~�����쐕����C�R!  ��>��8::�o߾�u�V���C�	Խ{wl۶
Z����(((��g����@g>ͧ
+�J�N,̛���׉�|!0&+‘#G0j�(\�t	���6l�={�������___�1�����̄L&���-T*������Xe���Ml�
��R����ǏѤIi�$�j
�	$H��@�V�<l�0���?X�`
�޽�9s�࣏>�Z���˗���777����O�q:t�<y�			�o������f��fff���|�:X%]h3���O�<���8���0�MYu*ˬ�����s\\�
#������cǎ��8D�߿?z���b��嶶����ff�3f�`Vu��e�ejj�h�z2��8��ŋE�D���"�&���[Q��جO�<aA+���
h��͛8u�0o�<xyy�m۶hڴ�hKJ�P�{zm8Hm� ��D;B�O�IP��q6oތ���_�...X�t)���aaa
'''���������˜1c�~�?���!C����
+M�o����7ܸqCT��gr�����Z��q�믿p��p��w�;�S��������)��۷����AD0333�\?~�xԫW����
+�ił��X�mB,HOOg�6K���������qbbb�s�N6�>>>̯��!^�ç+tA�6m��
⣏>����q��=������C��P��t///A���Ç�pႠm|���m��۷\�����A�5;;�����k�������D=zT�6�j�J�6FFF"00P�����~��	گX�v��m�֭��m���®]�*���� k�Z-֯_��~�
fff8r��w��puu����ӧ3
��ppp���
+��
��E���@����OUX�)˼�ѣGhܸ1��͑����аaC(�J$&&������>77VVV8s�йsg$$$��͛,@߬Y���'L���۵kg��|{>�%1�����EDD�h�%XZZ�n�jժ��(s�0}��jf-���0�i-55/^�رc
��F��b3�nnnpssc���,=xXXX��1.n�v�؁���H�PQZ���:�*�Z�Ƽ�<�}b�n�B�\���h�&tf�J�RF��6�����e`��т�GD�*R�QQQ/� YT���͛???�<yG�a����������O�۷�\����/�ÇEc��q���'-��?yi�Z�&��ݏ��a��#G���8dgg��LJ���ޞf���a�yƘ��VVV "4�;w�iӦ���Μ�����B�-D5o�Z-�߿/*3��n��_}`˖-L�c�$$$��8\�p
~~~,և��������+Bk���;v,+w„	���d�HՑu�oK�V��o�>ɬV�	$H� �%�$�Z�w���2�0�qz���ݻ�KpP�L�ĉ
|҅(�4+77�֭c��/����AVVKCw��)p�J�R�q��g�2mi�>}0j�(lll0k�,V����gmm�,3LLLX�y�������d��BM[�Yp�k�jJ�T=q�s���g�=Bzz:]
+}�K�.1:z�(=z��i�>}�����g�ft��퍦M���зo_�9D�\�hH��?~l@k%1�՝F��8����?��b
�� 7��M�+A�	$H������7��֝����s�������Xl߾�1:�6m�J��qػw/n޼	��`jj��3g�g5jĮ�ׯ�4�[�Ɛ!CX��q�Ʊ:��W�V�q��8{��h�%�={���$�������.eYz��C����#l߾����L&æM��V�
�̷���ׯ����믳w�1��� "�i��.RfE�K�R1
�p��1:tH��*��ā�ŋ���	=z�@X�&���}�v����[�Ć
�J4#A�	$H	�����5��,K�
+�8�+""yyy��:G^�g���e&ѷo��qpqq�̙3فr�ܹ,�ݤI�ХK�N_;�gBt��LMM�
+�WՇSSSS8P4Z/[[[�� A�`R����T*<x��}���(�Jp��W��ڵk�8�Ğ����<ƌ�޽{�����Z��xWkkk�������M�y�~E{c���j� :���F||��8���?A�Ȃ�Kc������=M�6��WG�>}�͇%K>ĤI�1a�[:�_X��C��?�m7n�������kc�ի'�:&t7nlp����h޼��e�=Z�򬬬ЬY3A��c���6h�@�N��PÆ
������Q�F	Z���Y���$�<Q�Ν;�&M��e˖����'���m�0d��:u
+���HLL�رc����]�va޼yt�����!�ˡT*
��i4�b���/�[�n�S�N��1/���5Y��q��900�1�j�>>>�?>`�֭�߿?\\\p��yddd`̘1�j�P*�,SBnn.,,,�0=��!�|�2z��)�5@Lt����ӧOcƌ�V���?���K�Bn��}׷owXY��ر������;���OL�:����X��ɓ'c�޽s�U�kR�6J�*����;ﰨ�.���ґ&�JSQv�^��bG�]�b�-���b���D�c�(�AE鰰�| WV��,�d������93�ޝ3s挲�d��ߖ�y(�#G�`�Ν|��˗/c����������޽{q��ŒGg8���X�j���J��4s���+���ϜFDD����?~��ϟ�q�J��,*aذa033ða�ФI> ���6|||�<555���#��B�r�9�W�+ݖ�[�l�T���䳢͖6_�C��=y�*���;^�8�S��?{�,#���.\��s�3����Ç���D�V�Z��A (l������TI��9mP�Nߺ����_i�����/_f����q��)�c�/������qΟ��?���VV�ؽ{G��);�������X��d��ߖ�y(�y��Y�f�D�6m���{��rxzz"77���;v,&N�����cʔ)%Fk/0�k׮���p���+���!�����___6�i�&>jjjػw/
�J��J��1.�y��zT֑��:򖛛��qe�ݻw��Ɂ��y�gˏ=
+}}}�n����8�<��\�q���\���(�Zi��EYY��2n�gmm]�
A�������q�q��1��T���[���0c�\�z	7o�*<G�
����/1��<{��Ux/1��`����h����…سg�R)���q��uL�:ݺu���^�~���0$$$�C������###�B̘1
+k�J2��ē��CSS���`jj��\
+P\:�������Ɂ��#$	>|�ڵk<x{{{hhh 88D�
 --
7n�@ǎ
�O�F˖-���Qn�4JB"����pss�4z���CԬY��
p}����7o��999�Z�*������۷�2��>2���9�wUU5DG?��S]hh��{�hذ>���޽
8|xz��	|��W������/�����ž���q�����i�`0F�8�4���%C	����ѣG���_�~���B2��tuu����Ύ���]�F�Ν+5-�\NDDժU+�xES�o^^^����;wV�2|V�����]���H"�І
��۶m���h�\A���r�������%�LVj��Sr���Ri�j/�TJAAA��LgϞ�V�Z)%m$�J� ===j߾=egg�رcIOO������i������.]�x�����H$"uu5�D�t���� �z�R�kG�M�j9�T*���}�y�E�2d�n�Ql^����}؇}؇}؇}���0%0t�P����������۶m������1m�4���C ���X�`
LLL>����<<<*<���g����)뒉��`������"������Յ��������+���Μ9�����;#������QQQprr��w\�x�5RXK���r���<�L��_�"�[�lAJJJ�i%''�1GJ��8�z���7Z�h
///�B,_�K�,������O�[p&$$����y2*?/^��ر��8
�r9�6m��5������hj��z�j�jB,��ƍ���O?"33WA��5�@������~��w��a�?�����@<}�0i�$���)U^�H�u��
\\\мys�ױ��:֬Y�<y2rss��ghh(n޼�z��aÆ*�)S�����֭[		����ԩ��������� iT�.]��R�^'N��D�t9cbbp��Y8::V�.G�e��wDFF�ʕ+�U��5k��|����֭[__�
+�=ILL�ѣGajj��={B.�W�39~�x>V�2����ɓ'acc�Ν;W��1a�L�0
իW��>+��(rss);;����)''���rrr(;;��a��d���Cb���f�]]]+����w�*OA=��L��f�7n�H���DDt��
+$"���Xڲe�D"��H$���L&#�DR���C��Y�o�=R�
�V=��yuuuRWW'UUU���J***$EGG�z���U짰�GYu�crrrh������J͚5���4��?���y��
+�7�����_��
+�x4�޽�,,,(//�Ο?O(66ZA�PRR|�����_<��5�;vl��YQ,_��М9s��2~����V�\Y�2v���_[��"4p�����7o&4a„��K�,��<oݺE�iӦ��z=s�
��]��cd���򧸀]��
+E�}j�N.�c�ҥx��,--!|�M*z�ֲ�SPP��\i�山���̄��$	BCCѠA~0�;w����zzz�T*E�z�����۷o�M�6 "~����c����=z4_���T���}����?�3By�F\TI��2d^�zss�J�G���ǖ-[P�^�O^��?~2�L&����K�z��-Z���ݺuða�`dd�F�������GNN�;����rщ�hժtuu�=���
@a��3g������e˖c̘�������+�<y��cGb�(_�D"�i���U1n�~�}D"`ذQ�[�U�Z��)N���c��)���`��de��ߖ�
���ܹ3LLL��͛J������dOя����khh`���2dd26mڄ����mۆ�-[	�(�=wwwD��oyX`��e+Â�


�2U��ѣ��ŷ.�
+5�ˢ����e�k555���O�(lw�)����cǎ!((ׯ_ǐ!C���	ggg���k֬A@@�Ν��z
+��;w.nܸ�ŋCUUϟ?���;f͚�_7i�$T�R���c/�qg�ԙ�t)��e2���X�ڟ�.!�
�`nn"�P(ijg�J4���`�
�'�6m>�޽{W
+�8<}���
>�^>,,�_�w��M���CEEaaa��Ӄ��
��M�.]���-[��8ܸq������D���Q�~}ހ?~<?h0r�H�
�²��"��b䗵�<dȐJ!���'�%.����W�3i�$hii���)))�Z���,>����5����q�F�o�gΜ��;p��r9�����AD�U����9[[[XYY����wA�u��ϟG�~��>p��!9�J|�9s�`Μ9e\a��(0��;����ƾ���lm�߷y���HNNCXX9����>����M�6&���nܸ
//�
+�s��
�GMEТE��C�I�=*�}бcG,]��B�8ЩS'�>}C���<Ǎ�۷oWX~q����S��Ç#::���+��ѣG�
+˳_�~HKK���Z�jpvv��<���=���:u*+,��ի@�N�����޽{_��΂��(�\7jԈ�Q�s��	t�ڵT��ƍ�߿?������ZZZh߾=bcca``�*U�(�������\���pԩS�#��[e��f����b����^{{�2�WZ�"�@ �e�z�*"""0f�.^��s�ΡO�>ظq#�lق�c�b„	��Ӄ�����MHHФI�k�Ǐ����1b�L�6
۶m���?

1h� �̌o�~�]��J_&�;�,�
+�*��q׫���r��_+c�L2V��PP�B�����!cy.--k�=�KF6PI:Q�)LIJDD8z�(�7oCC����������[�n�����ƈ��Ajj*�ի�D�[�n�QR�_��:u�@KKQQQ���C�ڵ������4mڴ��˓��X���T�vG�5>�^��

Eݺu���zϥK�p�ر"ǵ��! �ɐ��555hkk#''���
+��R�
+�b����066�g���".+���8v�޽{�ڵkCCC#F�@�*U����Xuuu���!((K�,����R�D.�c�ƍHLL����all�ݻw����>|8����j�*L�6��H��`0�m�2*�LF&L cccZ�4堠 ��ե�3g��mmm�Z�j�����4uuu")�d2��q����߸q����ݻG;v��˸nݺ2E�/.zse�0�(GG�u������'�&�;wn�i�hт,,,�{��DD4k�,233�={���۷	U�Z��KeG�'"
+��g���Ώdnnn��7>>�f͚���`0��yT)))
+
+B���Q�n]����Y�f�t��ׯ���Px{{cƌ
+�X�pa��s̾r����C$�����Յ��
-Z���>�����Ѹqcܽ{����>+/�q�Ν
+]{W�����D���V:���~(kz���>}:D"������ͅ���BZzzz�F6�����!�\���ЫW/ԪU�F����	-Z��K��w��8|�0�Ν���$���`֬YJ�	
+
+¾}�@Dppp����1y�d���������Ñ#Gp��i����~P���`0��,�@s��A�|�S�N����akk��˗c�̙pvvFdd$������O�@�V��o�����+�DFF�
l*.\(v7�ҐH$����Z��Έ��(U_�݆R�;w��ȑ#ѬY3�;w[�l��I���J


�Q�������s��U�.�g��`0��(O�.Dff&-Z�
�o߾���C.��^�z�9s&5j���h�Bxxx|2M��РA,^�������oAE)+B������<y2�������I�^.���ֶ�y"Š+p���b�������]�t�_��֭[cĈpvv���6f̘
 ��5k*}_ӂ]#�������G­Z�* ;;nnnpqq��	��.�g��`0��(�~.��޼y{{{���!%%YYY�}�6:v����c�…�H$|@����2o+fhh����J#�w� �+t_�O!�J�m���c�<77��k444�e��WP�|ሬ�Q��x��z��0�8q&&&HLLD�������#%%S�Nʼn'��Sr��F�B`` /^ooo���8{�,f̘�����իWpuu���."""����^$��`0���5�w���;�޽[)d�Ő�d���^�#;;���4V�\����R���Ԅ���'��ϛ7qqq��_�����c����~~~����gݯ]��}���nݺ5j�Rf���򐜜333����̙3x��Z�l	;;;������]�t��}��`�̜9�¶�)���`0��`�[��(��qY���5��&M›7o`ll�͍$uu�rs��/==��k���0~�x�D�� IDATxzz�e+nV^&��…�>}z��mٲe<x07n�Px{{�֭[عs'��;v`�֭6lF���6���App0<==accCCC>|NNN�ԩ�|O8~�8f͚��{��`0F)�n�
������7ov��Qiʴ�~4hЀ_����m�:::�4�۴i�L�P��W������I�&���?��3֯_�q��
N�<��g�b��
hܸ���a�ȑprr����1a�t��
�����C�b�ΝdeeaϞ=J1v�r9�?���$xyy������HLLDǎ����g�<�=X�P�^@��m�-򮈼*��Sz~�ƃ�l��9�(%*z<^��W���u/G��J ��S9y�矦;��_B�j�p���J�Ц������?���A��\�r�z�*um~^^^��	
+�-88���Y�&D"��ϟcǎ�t��֭���p�����2*��k���!KKK�d2$&&�FwFF�lقnݺ)��(���p�]�v�^ˌ��;�o߾���
x��
�z�<���R��H���7o�=����F�Z*EV�T���{ؿ?���C��P���R~8�CB�sܿ�B��P$h߾G��iD�\�p	'�Tj>��op��Aܿ�{�A��-���������<�x�۷�
uu
��L���1�R��8DGGa���X�`�R���8}�8�_B��Ѹq���*}�H�����VU��cnn��
�������������T 22�\.C�>^pvv+S��� 22;vl’%+ �)%���Lܺ�Ї'"XZZ�F��J{���2q�П�?={vC��ʹ-9p\.Μ9��m&��мy{���)AF�ɓH��jj����Ž�Y�
���05m�׮]Sj^�Z������H�H]]]��rdee�aÆprr���ña�ddd��������TX[[�s���6�P�~���e˖�ҥKQ�vm���"99


����P(DXX�lق���+��.\���0���a�ʕHII���?����i�&���b�ĉHMM�T*ž}���;���O�m�6�5
+��#�����;w��P>VJ~|�3g�)���"�}��
�q�vp��f�Ź�ҥ�_��iӦ����EXX8�"�Q#�m�vh��RS3!�)�+���
+CC#�ښ�ɓJ�:t}��EϞ=��`�={�A&�"!!
�=KODHIIEǎ�>>>x��9�=
+?�9�?���{������R��ǿ@Æ
P�J�����sh���{P��C��޳g�`g���H���TZ�96��t���w4h�_��+Wn�ر�֭�R����͛waܸ���X�v�uk����V�wL�Z�����P���R�z��>\]k��Pr�@~@���g��畷d8<xpu�ԇ�gԩSk���W�^8\�������W������@nn.�������r
�^P��3'`��6l���غu~�q6/^���D"�7E"�Pbb"%%%�L&���<JLL���4����TJLL$�DRjZr���n�J>,r.;;�J�������(�S��ܹs�444�f͚t��A��ʢjժ���3%%%�e�����z-����lZ�~=���QXX�ڵ��R)�����?��ם2(K��ʛ�`0���S���gee���>-^�������I]]���������HCC�p�ͭ.u��Vi�ڢEC�����!�\Nr����mIGG������Z�r��Qcc#�9s�Rr\�|a��ѦMIEE�RRR��gnn.}��L��0$dll��|������
�����I����<{�u�В�[3�P��3&����±޽�Qݺn$���=�[��
+	����{L�֭�J�4�5j	�B@)J���͛��h]��^4g��BGr�˙Xa}�v�SϞ^$����$&�:{�4�իg�%�<[���3glll���#�7


����ŋ�v�ZH�RL�2�Z��۷o��O?����q�޽;LLLЩS'�mꂃ��믿BEE���A���Eۻw/:w�}}}���}��Źs� 
+1r�H�����ׯ+�^��DEE!''۷o���
�����L�ܹ)))8y�$Z�l�Ν;�ԩSJ)GY92#�w��'��
��$uu5X[[�͛WJO^�~�:ub��� ���o�w�o���8t(@�܁����Niu{��m6꓿��=k�d�"T�f��ӧ����䋊����	ڶ���-�����'O)%�u��a����L$0f�/|}�"//Oi�V��
_�q8|�x���RfT��_�����1###�'N����~JqY
+�h����7���+���ٶ����F��͛��u�H�|�qܾ�ڵ�����穡a===DG?EÆ���,Ǐ���͛����Z��o�D�:n��=~��q�&:��۷oB*-�6,Z�|������g��)e�Od����%��hhh
HIy}}��QƷ$99�޾}K�V��'O����3�9s������իt��""rppP�7''�^�xA��񔝝Mr��^�|IYYY
+�edd(]�Ç�ӧO��ٳԶm[�[�.��Ύ����B�e�xd���3�?��w���%9;;ӻw��ݻw�s�@���!��y�J�}x�2�Phh(]�z�Ə��]��PRR���LKK"��h��eԽ{w�]ۅ6lXM999
+3��MX�m@IIoiݺUT�F�
+����˥��tz����((�R�}��
I��$�(����2''')��4h��<PBB��n\�x�
�
+�r��ݻw�
���}"�Qh�e˖���
I�R��hvv������'I�&Yvv6��p��Q8�߿[������ĉ�յ:��Cqq�Jy���r�={6������������ҥ�)//�������Գg7JJzK�Ԧ�'��j|v�
+��f��r�������6$	��5�D�G�Pd$���{��œ'O�����۷c�ڵ3f.]� ?��s�����L�4YBBB`oo��u�"99-[�DDD=z�֭[Wh��eK96�`0ߖ�<�
+�ŧO�DL����C���_��pvv.�mfK�-x�0�w௿���߇��~ЩSG|��\XZZb��
���BPP�R򌍍a�������g����P������}|FF:��=�{�nT�jXnQ�ˢ�W/����U�E۶�h��S)�co��P�ו[�.�Y3O�h�zzz�.��Ǖ�<��D��
+�_,,,���V)}��z/��*���P�:����;1{�l2��gq?~�;vlKKxzv��q#�Ԟ��խ[c���zu�
+�ې�P��������/+���++�<y\)}hii���O�<���6Z�ꈶm��[�+���۠i�ƨV��R�*H�ԩ�8z�/�J\�p�g���ߐ&M�Phh(�^��<x@ӦM���ܹs��˗���s�7o�0�#����ޞ233��u�XLC�!"��Ѽy�H,+M���D���!777����5n�XaD�Q�F���ADD�6�&GGkrqq Sz��
�db@m�xRZZ�����;���_9�G
�&rqq�ѣ��峴4�!C�۬�ŋ�����\\��΂N�<Bǎ"4{���T��#}��ц
��26iҐ$	�ǿ�͛�Rn�������v���U��y������w�u!"��}�Ҙ1>�u7�Q���:=zըQ�\\�ں�xV�;��{B."4v�د��ݻdjժ1/cϞ�)//������4l�P@-Z4���̯֝�w����9��8���%�(r�����
���C�s�0��ǁ233��nHJz[!3�����+�_ߕ���>J��.���(<<��O�Nh��J�q��ydnn�߿
���4��ID�u���|��~�&���Fr����u��A��]�Z茔P@�N��Oxx
�˗�*UW#"2dI�{��� 9q��J�����ʕ+pww���3�Ν���`��у�ٵkW�y����W�w׮]��ֆX,�������T*�*b���ϟ?W8~���"#W7o��O�u�`0���[�
�G�@("77�X�~=444��>����п�P�9s۷oǂ�!~Y�E[[��Cy�:;�Q�{�.��ߢ����;U�F
����6���###?����)�&�;
+'NCRR
��8�!C�yUUE�8����k�=z���={1t��秡��!CA*͟Y466AZZ"<�f�<���	� >>qq	h����f;�C�ӳ)j԰�q|̣��T��Y02����>45���Os�����+���o��x�3uu50��YSS�DBp���WaʔY��s��{7��֘ש��#[�j3�***�J��Y�f�=�ժ9
d2R�#$�LMMx��6�r͙3
����;��ӧG`o��o�V�))oA$���)ll�~��bc�`ǎ���!��k�˖����
ڶm"›7�qVڷ�ƍ�a�
+�r�	8�èQ��F�����s���
+}}�r��а*
�4i��+�s�ҥ<�~����A��ȑð��A�픪�۶m���&v������Y?!(�:�N��.]��9-6�����Dǎ��:::hӦ��5���%��yb߾}8s��4i�
�ȑ#���C�>}������Avv��^֟�bό��`5j�F�Z*��ͅ��ZZ
+�p##���:����a„i���oӉ���:w�Rn���f�R����HKK�
q����mTTT!�~U�~,#��gN���7��!���x4j�����RE�&�T8�����yACC p��x���	���PQ~����
+rl��
�={��}�oW}p�L�/�
+ihh�ǧh�{��bҤ��>}�/��}��A����C��7���~�X���>�\9�޽��<����K
*�ρÎ�l�o8|xz���7�`��)8q�o$%%+�edd���剷�7�Ғ��bq:�������n<~��V��E�V�_���<<~���;�<�Z������n��d�V�ZJբ��b���J�V�D��ea=QW�B^��_��(b��Ξ=KW�~pw�r�
+]�v�����+�z�*��İ@w����<y��z<�|WNKKK:t�R�vq�E#GR�[l�tG�B�깐\��<O*�&++K��ꢄ<� t��Q���ի	���R���%k��ɶ\�ǽ{����lY�As�Ydl\���������N�gO�fϋ���q�'UU5JM�w厊
+%�c��J�K�K
+tOCCHw�\���
+<E(0�$�͛XRSS�3f(M��8����T��@�Ǐ�''Ǔ��*���*�^���F.X��w�رc�RR^+�=/]�H���x��YG��'�s�6�Xvv
+������>�}XW��`0Fe���z�R��� ��lG�Q��J5�:�g��]!rfddR�zn����:]e0`���}�uIWW�455���ׂR)]�א�k
���ܹs	��铍�	
�z�j+Mw����Y��'?��r:ԛ,-��Ò�22���ݍD"
9:Z���S��a�@��� #�m�m���B�D)::i�D@���diiH�Y�FR�DD���!55U��x��<����6
��5m	�j�һr%�D"���LLt��8Z�x�R�o����Z5JMM������{�H$"MM!�~�۷�g�+����`0�R,
�8			���ENN
�Q��3
�N���
+��r����DFF ++U�h�N���(�n������GHHxUU�����ʪ��ʓ��"55���J՝/�#>��R����F
'��Nxx(D��KR�r9����=W��|���,T����<DDD!==�}]:W���d2<z���PSSWJ99و�~Zl��P���k(�9��y�ׯ�@.����5
+-yRnݦ�����8Ԩ���˩�"��ׯ�bq��M��P]i2䙘��?
������A����E����/�]#J�1>>/^�A*����vv���%Gl��`0��`0��V��`0��`�
��`0��`0l��`0��`0`0���a?>7����VY�d�G��`06�`0��qسg|||>+bhA��.�N�:�q�����OQ�zupggg>͕+WB.�I��ɓ�8�
0��`0��U
���B*�bƌ�z�*��� �����G��u��PQQAHH��������m������w�^�x�K�.���x�$˕��(>���D@ll,bcc!�Ѿ}{<{�!!!pssc��`0��`T �����!������/_bΜ9���Ě5k`jj��~�	�_��ƍa``�v��)�;m�4<R������d���-6u��}{uuuaoo�]�v
z�聩S���`0��`0���P6B����?~<���������X����Ø1cP�fMT�RE�Ǐ���yyyppp�L&CJJ
+�B!@EE͚5C�ƍ�f����8�A���`ee�G��F`0��`0����(444@D���@�&M��������lddd(\odd���4p�:u���C������W�^�͛71n�8��۷����N�:��8$&&��ؘU>��`0����i߾=���a``��
"++>>>pwwG�
�����ӧ�3�|���8�<���`ddUUU��������w������ƒ0z�h���"<<?��k��`0��ህ�f0�SD�/�yH$������=
+����$�mۆ�#G��`0��`0����Lr���L���6��`0��`��`0��`0���`0��`06�`0��`0�c>v�'"�cŝg��`0��`T2޽K���ll���El��8�j�
+Up�̟|�l��p��"1�8����%ƌ"9`0��`0�2 ����u^�x����*b�?{����CJJ&$��9��x���d��e~3����`0��`0� �J���˖-�����=hii������K$���J+����f��`0��`T$�ݺuABB>|���~�̝�=�B���z�?tt>zz��ر����&e0���gCD
+�R�\����W�~\�q?�Q����_���lmm�v�Zlܸ��Vq��Y9r���/r��˗�������


�d��M�6,t�e̙3�[�e��`0���8ϞE�[�>��xP)"M��tذ��ٳ3�w��E���L8::��ۧ�
P|C�|�I������������a$lm������/�O�puu��˷X�|���1b6mZ�����҆��Z��W���^��,^���ZZZ��Қ6ڵk7���󛫴�

3��`��ܹ8N�m�6��('._DB��2\?�86��;������P��7���ڵc����8S��b���\NW��űcc���022a
+��m�z�q�Ƙ3g!���D&�a��Ɉ���۷o[�l@˖�K�' `��Ӑ����򠮮�pA,�f͚���½{�J�c��`0��гgO�1��T`��/|.�X�1��+
+���<WjZE����많�vMIi+ʆ��8�Pp���r�_��5�m��w�E"����_�_o��?@ff&����e��l%��0�G�Ν��Ӳ���9my��=��ɊM�4�u�(��oagg�~�*���zZ����MI:_X�������~�V���deeB$����۷g/ȯ������f͚! `��G�ѣ�ݻ��{t���S���Ǻ?|�pDEE!6���=z���`0�?�	F!++/^@Ϟ�
���Mk��E�7��������L�>	
4��Gc,\8��9�
������	
4@�ƍ�{�v���;֭����=L����z��#����w^�ܹ��}��fM���K������/�_��Ν��ӧ'j�r A}VȠ&�F�.����!C���(�ҥ��d��*9�-�
����E�����\��ҒѮ]i��eeIDAT;��g���r���hѢ	�4i��s� 'G\��z��5��
''�l�K�.�L&�T����}p�N8N�<�Y��@.�cժ%8rd�`Ԩa8~���Aq��Ex{DNN:��'O"1y�x���A��غus�F���OFP�e����G�.|���a��A�Y�ݻwƮ]�J4��r�۷oE�����RÆ
�۷/�ݼy=�u�����G������_�p��u�k��k�´i����+��?!2�	N�����
�p��
;v�G�A�zx�*���L�4���C�ͱj�rH��b�>w��Y�
		I1b����8�0|�L�0�����7�cǶpv���#�#%%QA���c3:vl��<y��4$�>�n]-Twr���,�;w�����X̘1��nhڴ)�,Y𾞀�\1&N�����5k��жm[�ٳ���8aa�=z��Ю];=������C������^����~ؽ{{�����L&æM���7��$��];
���g������u~u�����p��X[�+ߣ���`0�hv��H�����^�,����V�XH�����8��2����X�I***��Z�BCoR@�@����i�k׎��t��Q�q�"YY�����Ӎ�����0���+���>��Ԡ�/㈈�ƍK�ƎI��ߥ����H$����DD�u�:RQ����t��Erss��]Ӏ���,X@�ᷩE��23S�ر�d2��u�I P|��"�s��i��� ���ѱ�={��������ц�\�BǏ�I�w�n�}V�u���r	
4���B���@������6lXEի�R�Fui�����%͘1����T�B={�x_f9���E���DD$�g����ڵkN!!whݺu�~���b�< `��:���&-\���!!�y{����{�l�@���}r�����n]Oh��ut��ejР�B;�X���o�����m۶�޽K "�5k���ژ�̌�ԩSt��4|����������ݽ>-[6���~�a*���C5��yH���5kN���h˖M�V�X\��DD�w�Nݻ� ==MZ��WJKK����
8�,,iΜ��˸�К5+)2�.5i�TAƽ{����z�&NM�kW'==m��d���������{$	999Ҋ��(;;���̩vmG�{��޽���T�w�DD���JVV��lO������`���;
+q������� ��.�7����a��a����ƍ�
EGGя�3��@ �n�����{�K�ILL �*�o�v""���!mmm20Цի��י���_Rh��g�*6Muuu�ׯ��2ڿ7
�M�V�T*U�(6�`0����0��קQ�F2���������!CC]��eJ����t.=~A���@��L�K��je�Hr��ޖF��p��W7�6m2?���
��GD�oW��'""CC]ڶm3>##��͍h��|����|��Փ\\\����O����e����:��d������7ob������Ӄ��u�i�:����w�ޑ�N[h0�����~dhX�rs��6@aa�uЩS+�֭�B��o�FǑX�Yl�<�����R	5n܀�tQL�С�Tڜ_~�翿|O��Ft��I�|PP��=��V4e�x""Z�v-
��ׯ҇���[��޲e#�0a�����y�&��g898TS�'*�A�e/�Ϟmdg�����#�P@#F/"�ŋ?�iUZ��W""rv�A3gNU��E�����U�
�%KR�:��8}�$	�B������T�V͊��\?2Uh��?���ӳ%5h�p�o��h�ĉDDdffFm�z�H+W.'}���*2�#��I$�l.v�Q6^ڱ�C=ZXX��{�׫����٫�s�N-��ڵ#խ�Jn(��cjZUi2�%��`0�`
+�.��ԬYm�~�N�ڵۘ0a,�B!�b1�b1TU5��h���Cp��y����ãQ!oQ
�6mT��$%�C\�K���Fnn�ϸqq��Q�:SSc8::��UUU!
+����>�4��7�w�����˗�6l(`��
X�`/��#G�l���e`���]���W�ބ�W��i�e
+UP�f
��׉"�2��Ϟ=����������k�r9�RY�����$%%#!�8��ѣ�a``���ӧ/�W������bt��	D����m��흑����H̞=Y����[CMM׮�/R��w�����ƍ=�c��x�2]�t�իWajjg�Lr��ǏAD�C��=<��megg�8[�^
+o}FDhٲ	5j���^���pL�82��ϫjUc���"&�a��K$�"�d29�.���ƍ022��k->]�@�;�������0o�"��֭[���2���o������ر3d2^��}��F��,
��̐���8>���8�z:p�(֮]�5kBBB���X�d<=[ASSC�m��8�Ź|�F.�C"�@"Ƀ\.g/�O`bb
+"�С>�~��ǃ�`iY�_
+��#CϞbQ:u���~���� "��������ׯ����`0�����q211�-���*�V�Aժ:02�CB�kܸq��Y���~h�˳�3�q�5j��@�ϧW��x�"�HG�H�T DD�=��~()�۵kW<x�))�y�.]z��i�p��T*EFF:8m�ual\		/��AT1��]Ԫ�Cê>�gΜG�֞��I�ܹ3~��0{�\xyyA  =�`���|Y�V�A�j�`ff����O�-�J���;;;�㪪"T�����GE�	
�
uuU�ů9
�������0��T��-Z�<2��X��suS*�"++3f̆��z!�-!�����[���r޾}++3>]--� .TvAC�Ӄo���������OSS���HMM�d�YY�HOO���j��M�2��Ɉ�����ϑ���Q�F��@���&++�:u���ll,1`@���l���l-N�?|��{i�~*?6�`0���bTU�������>��Y���ggg����ŋW
+za��8#.%%�﬊D��͕���g
+y��� ;[��2��rԨQr9
+��
���f��O��8�m�����c�={|}G��ӜٟC��^E�"))
�W�-r���C������\����7�I��e6��}����}������<x08���Z��`�w�T(Kff.��бc�O����CCC\�tS!��l1��ޡa��E�qu����L��J����$X��'ܾ}&&�`nn����B� %%��W���R>�@@�V�ZD���L��?싍Tcc��"%%CA��oS�g�!���6BB�+>��d�X��#�x.�����M��*�?;[�W�ޢs�.�,���tt��ٳ�|�����-[��W:t�…�	�T���;��US��������x�8�7,�[���d�
��`0�ҵk{�\��g�##Cajj�,͛�
��;��d�y���li>�x�&�7�
`͚��kaa{L�6[!�}{�S'�2�"�LL�a�����X�h��T�v��ڵ����:u
+;v)��(ѵkg=z�_r��QPSSEzz�G�Rddd�Z5�BG%X�f=TTD
+���]�@�ԩ8N�a�FCOO�[�~o�k�K��ؾ}��=[�l���d��몠
���P��~�e�B�6�==}���16l�L�.��}��y��-�������^������k��s�~��G�������^��M�fX�b���+W���ܰ�;�ѫ�޼I�͛"�������~~3��f�3A!��C�@SS�}���������رc�k?�Z�˖�����3��H���?YN

MԮ�}��(��U�N�>�L�:���
�a޼y��t;���ǫWɘ?����w�1Q^i����Lu`D�\���.�)D,�R�����Y".XQ��t��&�M㺲��6�6P��x��hQ׊
+^�.��l�����r��3�0.��|����2��{�s�{x��w�������0�1�6L�@DDD�ӧ��$--�_¿�ɴi
b6�*����G&L���Y֯_#�ɉ�L�}��++�*��W�N��V���4���n��h%7w�x{{����mv
�~�R�+�̖��ߊ���h���㏷�I��������)筭�)r�%!����訖��Pٰa��Ր�^�IhVWgI���oN�,77M�$i�ח^
+ggHFF������'�������]�,Isr2���^��\�K���W_���+-e��}*""��Q�������̰f���c�1�^����n�ZY�t�5!���JOO��Q�}7EDD:;����I/��͖Y��ʘ1�r��%����Ȳ�…�Kf���
}������+6��I�<D��JW�=ٶm��%�t�;qvv��.Y4g����.��sl����qs�Jnn���[v	���vۿw�Ny�E/�$����6�g�eG���p���77����*m���!:�8���>X#�A�z���c��&��j�*IH��1c�Hpp�����G�N�*j��\-���@�l�bM0�&���{�v���J~��ED��Ò�30� 7f˸q:����ɤ������t�RAZ[[�&���]�j���[��?O�����J��"""�����BL�<������k���������X[��t��� *+/b�x=f�~��o(��*�
+UUp�Էx��
�͋��Ϳ�^�ž}�֧����S�}�{̟���PTT���%pu�@�R��o0�Za0".�M��n��._��w�Y''��pGG;,EL�����
\�r'N����&DD�Eb�e��ѫ���Z�kl��G�}���/���BJʊGK`�5_1**NC��#$$qq��KJ�c�̙�())Be�x{�⭷`�$l��)���c��$477"/o��ܑ��'N���BC��(��ף��￟�����
+��M8t���/���QQ��5�6+��������w�d2����w�
eeGq��L����L�>ݺZ��	���Cy�	��� **��ی�3g�QYy

�

E||"4������ܹsHKKS�mmm�ѣǐ��+�m�Νy���¦M�q�R���������ȑC��������0DD̳����Z\�v
K�,���	%%���WW�M�gϞ����0�L

ŢE	�j�)�on�7��������W���9���UV���/@UU%��}�l�2ܸQ=��_������QSs���ļ���H���^��@H���x���o�� �g--wQ\��������xL��m��pq��̙��<П�܃���fDP�4>\����m��inn��;��h��
ta����h��L~�wv'�����1�0A��corf��aִ�y=��7����Dz!∧9]�z���'���?k��T��uk`a$�`���4�m�6=^��g�m|r�^=�1]]��ڳ��H���'z㣏r���q�����B``���b�K�")i)���PPP���(��. """]l��g��
�l6x�����$S=Vg�R���ǁeHNN�8�I�@�N���=R�N��U��<��O3�o��cs$�r�m0��;Hݞ��
���.�����uYY�Un@@ rrr`4�ANN6jjjQ\�
jk�G(XG��!\���pw�z�j�{�L��;�9����c�bE�s3��j���mm&\�P
�J=��E[�nEB�|�ٟ�����
�j
/�h���+DDDD4�I��0!℟F������
"""""""�r`1@DDDDDDDDDDDDDD�1@DDDDDDD�P�]��+n��IEND�B`�
\ No newline at end of file
diff -Naur ns-3.22/src/spectrum/doc/spectrum-tv-rand-geo-points.eps ns-3.23/src/spectrum/doc/spectrum-tv-rand-geo-points.eps
--- ns-3.22/src/spectrum/doc/spectrum-tv-rand-geo-points.eps	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/doc/spectrum-tv-rand-geo-points.eps	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,5740 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: MATLAB, The MathWorks, Inc. Version 8.3.0.532 (R2014a). Operating System: Microsoft Windows 8.1 Pro.
+%%Title: C:\Users\Ben\Dropbox\FUNLAB\ns-3 TV Transmitter\randGeoPoints_35lat_260long_100pts_2000kmRad.eps
+%%CreationDate: 12/06/2014  19:20:57
+%%DocumentNeededFonts: Helvetica
+%%DocumentProcessColors: Cyan Magenta Yellow Black
+%%LanguageLevel: 2
+%%Pages: 1
+%%BoundingBox:    96   238   515   553
+%%EndComments
+
+%%BeginProlog
+% MathWorks dictionary
+/MathWorks 160 dict begin
+% definition operators
+/bdef {bind def} bind def
+/ldef {load def} bind def
+/xdef {exch def} bdef
+/xstore {exch store} bdef
+% operator abbreviations
+/c  /clip ldef
+/cc /concat ldef
+/cp /closepath ldef
+/gr /grestore ldef
+/gs /gsave ldef
+/mt /moveto ldef
+/np /newpath ldef
+/cm /currentmatrix ldef
+/sm /setmatrix ldef
+/rm /rmoveto ldef
+/rl /rlineto ldef
+/s {show newpath} bdef
+/sc {setcmykcolor} bdef
+/sr /setrgbcolor ldef
+/sg /setgray ldef
+/w /setlinewidth ldef
+/j /setlinejoin ldef
+/cap /setlinecap ldef
+/rc {rectclip} bdef
+/rf {rectfill} bdef
+% page state control
+/pgsv () def
+/bpage {/pgsv save def} bdef
+/epage {pgsv restore} bdef
+/bplot /gsave ldef
+/eplot {stroke grestore} bdef
+% orientation switch
+/portraitMode 0 def /landscapeMode 1 def /rotateMode 2 def
+% coordinate system mappings
+/dpi2point 0 def
+% font control
+/FontSize 0 def
+/FMS {/FontSize xstore findfont [FontSize 0 0 FontSize neg 0 0]
+  makefont setfont} bdef
+/ISOLatin1Encoding where {pop /WindowsLatin1Encoding 256 array bdef
+ISOLatin1Encoding WindowsLatin1Encoding copy pop
+/.notdef/.notdef/quotesinglbase/florin/quotedblbase/ellipsis/dagger
+/daggerdbl/circumflex/perthousand/Scaron/guilsinglleft/OE/.notdef/.notdef
+/.notdef/.notdef/quoteleft/quoteright/quotedblleft/quotedblright/bullet
+/endash/emdash/tilde/trademark/scaron/guilsinglright/oe/.notdef/.notdef
+/Ydieresis WindowsLatin1Encoding 128 32 getinterval astore pop}
+{/WindowsLatin1Encoding StandardEncoding bdef} ifelse
+/reencode {exch dup where {pop load} {pop StandardEncoding} ifelse
+  exch dup 3 1 roll findfont dup length dict begin
+  { 1 index /FID ne {def}{pop pop} ifelse } forall
+  /Encoding exch def currentdict end definefont pop} bdef
+/isroman {findfont /CharStrings get /Agrave known} bdef
+/FMSR {3 1 roll 1 index dup isroman {reencode} {pop pop} ifelse
+  exch FMS} bdef
+/csm {1 dpi2point div -1 dpi2point div scale neg translate
+ dup landscapeMode eq {pop -90 rotate}
+  {rotateMode eq {90 rotate} if} ifelse} bdef
+% line types: solid, dotted, dashed, dotdash
+/SO { [] 0 setdash } bdef
+/DO { [.5 dpi2point mul 4 dpi2point mul] 0 setdash } bdef
+/DA { [6 dpi2point mul] 0 setdash } bdef
+/DD { [.5 dpi2point mul 4 dpi2point mul 6 dpi2point mul 4
+  dpi2point mul] 0 setdash } bdef
+% macros for lines and objects
+/L {lineto stroke} bdef
+/MP {3 1 roll moveto 1 sub {rlineto} repeat} bdef
+/AP {{rlineto} repeat} bdef
+/PDlw -1 def
+/W {/PDlw currentlinewidth def setlinewidth} def
+/PP {closepath eofill} bdef
+/DP {closepath stroke} bdef
+/MR {4 -2 roll moveto dup  0 exch rlineto exch 0 rlineto
+  neg 0 exch rlineto closepath} bdef
+/FR {MR stroke} bdef
+/PR {MR fill} bdef
+/L1i {{currentfile picstr readhexstring pop} image} bdef
+/tMatrix matrix def
+/MakeOval {newpath tMatrix currentmatrix pop translate scale
+0 0 1 0 360 arc tMatrix setmatrix} bdef
+/FO {MakeOval stroke} bdef
+/PO {MakeOval fill} bdef
+/PD {currentlinewidth 2 div 0 360 arc fill
+   PDlw -1 eq not {PDlw w /PDlw -1 def} if} def
+/FA {newpath tMatrix currentmatrix pop translate scale
+  0 0 1 5 -2 roll arc tMatrix setmatrix stroke} bdef
+/PA {newpath tMatrix currentmatrix pop	translate 0 0 moveto scale
+  0 0 1 5 -2 roll arc closepath tMatrix setmatrix fill} bdef
+/FAn {newpath tMatrix currentmatrix pop translate scale
+  0 0 1 5 -2 roll arcn tMatrix setmatrix stroke} bdef
+/PAn {newpath tMatrix currentmatrix pop translate 0 0 moveto scale
+  0 0 1 5 -2 roll arcn closepath tMatrix setmatrix fill} bdef
+/vradius 0 def /hradius 0 def /lry 0 def
+/lrx 0 def /uly 0 def /ulx 0 def /rad 0 def
+/MRR {/vradius xdef /hradius xdef /lry xdef /lrx xdef /uly xdef
+  /ulx xdef newpath tMatrix currentmatrix pop ulx hradius add uly
+  vradius add translate hradius vradius scale 0 0 1 180 270 arc 
+  tMatrix setmatrix lrx hradius sub uly vradius add translate
+  hradius vradius scale 0 0 1 270 360 arc tMatrix setmatrix
+  lrx hradius sub lry vradius sub translate hradius vradius scale
+  0 0 1 0 90 arc tMatrix setmatrix ulx hradius add lry vradius sub
+  translate hradius vradius scale 0 0 1 90 180 arc tMatrix setmatrix
+  closepath} bdef
+/FRR {MRR stroke } bdef
+/PRR {MRR fill } bdef
+/MlrRR {/lry xdef /lrx xdef /uly xdef /ulx xdef /rad lry uly sub 2 div def
+  newpath tMatrix currentmatrix pop ulx rad add uly rad add translate
+  rad rad scale 0 0 1 90 270 arc tMatrix setmatrix lrx rad sub lry rad
+  sub translate rad rad scale 0 0 1 270 90 arc tMatrix setmatrix
+  closepath} bdef
+/FlrRR {MlrRR stroke } bdef
+/PlrRR {MlrRR fill } bdef
+/MtbRR {/lry xdef /lrx xdef /uly xdef /ulx xdef /rad lrx ulx sub 2 div def
+  newpath tMatrix currentmatrix pop ulx rad add uly rad add translate
+  rad rad scale 0 0 1 180 360 arc tMatrix setmatrix lrx rad sub lry rad
+  sub translate rad rad scale 0 0 1 0 180 arc tMatrix setmatrix
+  closepath} bdef
+/FtbRR {MtbRR stroke } bdef
+/PtbRR {MtbRR fill } bdef
+/stri 6 array def /dtri 6 array def
+/smat 6 array def /dmat 6 array def
+/tmat1 6 array def /tmat2 6 array def /dif 3 array def
+/asub {/ind2 exch def /ind1 exch def dup dup
+  ind1 get exch ind2 get sub exch } bdef
+/tri_to_matrix {
+  2 0 asub 3 1 asub 4 0 asub 5 1 asub
+  dup 0 get exch 1 get 7 -1 roll astore } bdef
+/compute_transform {
+  dmat dtri tri_to_matrix tmat1 invertmatrix 
+  smat stri tri_to_matrix tmat2 concatmatrix } bdef
+/ds {stri astore pop} bdef
+/dt {dtri astore pop} bdef
+/db {2 copy /cols xdef /rows xdef mul dup 3 mul string
+  currentfile 
+  3 index 0 eq {/ASCIIHexDecode filter}
+  {/ASCII85Decode filter 3 index 2 eq {/RunLengthDecode filter} if }
+  ifelse exch readstring pop
+  dup 0 3 index getinterval /rbmap xdef
+  dup 2 index dup getinterval /gbmap xdef
+  1 index dup 2 mul exch getinterval /bbmap xdef pop pop}bdef
+/it {gs np dtri aload pop moveto lineto lineto cp c
+  cols rows 8 compute_transform 
+  rbmap gbmap bbmap true 3 colorimage gr}bdef
+/il {newpath moveto lineto stroke}bdef
+currentdict end def
+%%EndProlog
+
+%%BeginSetup
+MathWorks begin
+
+0 cap
+
+end
+%%EndSetup
+
+%%Page: 1 1
+%%BeginPageSetup
+%%PageBoundingBox:    96   238   515   553
+MathWorks begin
+bpage
+%%EndPageSetup
+
+%%BeginObject: obj1
+bplot
+
+/dpi2point 12 def
+portraitMode 1152 6636 csm
+
+    0     0  5039  3780 rc
+85 dict begin %Colortable dictionary
+/c0 { 0.000000 0.000000 0.000000 sr} bdef
+/c1 { 1.000000 1.000000 1.000000 sr} bdef
+/c2 { 0.900000 0.000000 0.000000 sr} bdef
+/c3 { 0.000000 0.820000 0.000000 sr} bdef
+/c4 { 0.000000 0.000000 0.800000 sr} bdef
+/c5 { 0.910000 0.820000 0.320000 sr} bdef
+/c6 { 1.000000 0.260000 0.820000 sr} bdef
+/c7 { 0.000000 0.820000 0.820000 sr} bdef
+c0
+1 j
+1 sg
+   0    0 5040 3781 rf
+6 w
+-818 350 3052 94 817 -350 655 3211 4 MP
+PP
+-3051 -94 -818 350 3052 94 817 -350 655 3211 5 MP stroke
+0 2578 817 -349 0 -2579 655 3211 4 MP
+PP
+-817 350 0 2578 817 -349 0 -2579 655 3211 5 MP stroke
+0 2579 3052 93 0 -2578 1472 2861 4 MP
+PP
+-3052 -94 0 2579 3052 93 0 -2578 1472 2861 5 MP stroke
+4 w
+DO
+SO
+6 w
+0 sg
+ 655 3211 mt 3706 3305 L
+3706 3305 mt 4524 2955 L
+ 655 3211 mt  655  632 L
+ 655 3211 mt  584 3241 L
+%%IncludeResource: font Helvetica
+/Helvetica /WindowsLatin1Encoding 120 FMSR
+
+ 417 3365 mt 
+(-8) s
+1036 3222 mt  966 3252 L
+ 798 3377 mt 
+(-6) s
+1417 3234 mt 1347 3264 L
+1179 3389 mt 
+(-4) s
+1799 3246 mt 1729 3276 L
+1561 3401 mt 
+(-2) s
+2180 3258 mt 2110 3288 L
+2012 3412 mt 
+(0) s
+2562 3269 mt 2491 3299 L
+2394 3424 mt 
+(2) s
+2943 3281 mt 2873 3311 L
+2775 3436 mt 
+(4) s
+3324 3293 mt 3254 3323 L
+3156 3447 mt 
+(6) s
+3706 3305 mt 3636 3335 L
+3538 3459 mt 
+(8) s
+ 935 3748 mt 
+(x 10) s
+%%IncludeResource: font Helvetica
+/Helvetica /WindowsLatin1Encoding 80 FMSR
+
+1161 3674 mt 
+(6) s
+3706 3305 mt 3782 3307 L
+%%IncludeResource: font Helvetica
+/Helvetica /WindowsLatin1Encoding 120 FMSR
+
+3817 3419 mt 
+(-1) s
+4115 3130 mt 4191 3132 L
+4226 3244 mt 
+(0) s
+4524 2955 mt 4600 2957 L
+4634 3069 mt 
+(1) s
+4764 3447 mt 
+(x 10) s
+%%IncludeResource: font Helvetica
+/Helvetica /WindowsLatin1Encoding 80 FMSR
+
+4990 3373 mt 
+(7) s
+ 655 3211 mt  578 3208 L
+%%IncludeResource: font Helvetica
+/Helvetica /WindowsLatin1Encoding 120 FMSR
+
+ 408 3251 mt 
+(-8) s
+ 655 2888 mt  578 2886 L
+ 408 2929 mt 
+(-6) s
+ 655 2566 mt  578 2564 L
+ 408 2607 mt 
+(-4) s
+ 655 2244 mt  578 2242 L
+ 408 2284 mt 
+(-2) s
+ 655 1922 mt  578 1919 L
+ 478 1962 mt 
+(0) s
+ 655 1599 mt  578 1597 L
+ 478 1640 mt 
+(2) s
+ 655 1277 mt  578 1275 L
+ 478 1318 mt 
+(4) s
+ 655  955 mt  578  952 L
+ 478  995 mt 
+(6) s
+ 655  632 mt  578  630 L
+ 478  673 mt 
+(8) s
+ 655  362 mt 
+(x 10) s
+%%IncludeResource: font Helvetica
+/Helvetica /WindowsLatin1Encoding 80 FMSR
+
+ 881  288 mt 
+(6) s
+gs 655 283 3870 3023 rc
+/c8 { 0.562500 1.000000 0.437500 sr} bdef
+c8
+-14 -160 -100 -37 3825 1795 3 MP
+PP
+0 sg
+3825 1795 mt 3725 1758 L
+3725 1758 mt 3711 1598 L
+/c9 { 0.187500 1.000000 0.812500 sr} bdef
+c9
+-100 -37 15 -160 3810 1955 3 MP
+PP
+0 sg
+3810 1955 mt 3825 1795 L
+3825 1795 mt 3725 1758 L
+c8
+-99 -36 -15 -161 3825 1795 3 MP
+PP
+0 sg
+3825 1795 mt 3810 1634 L
+3810 1634 mt 3711 1598 L
+c8
+-15 -161 21 -36 3804 1831 3 MP
+PP
+0 sg
+3804 1831 mt 3825 1795 L
+3825 1795 mt 3810 1634 L
+c9
+14 -161 -99 -36 3810 1955 3 MP
+PP
+0 sg
+3810 1955 mt 3711 1919 L
+3711 1919 mt 3725 1758 L
+/c10 { 0.000000 0.937500 1.000000 sr} bdef
+c10
+-99 -36 45 -157 3765 2112 3 MP
+PP
+0 sg
+3765 2112 mt 3810 1955 L
+3810 1955 mt 3711 1919 L
+c9
+15 -160 21 -36 3789 1991 3 MP
+PP
+0 sg
+3789 1991 mt 3810 1955 L
+3810 1955 mt 3825 1795 L
+c9
+21 -36 15 -160 3789 1991 3 MP
+PP
+0 sg
+3789 1991 mt 3804 1831 L
+3804 1831 mt 3825 1795 L
+/c11 { 0.000000 0.625000 1.000000 sr} bdef
+c11
+-96 -35 75 -149 3690 2261 3 MP
+PP
+0 sg
+3690 2261 mt 3765 2112 L
+3765 2112 mt 3669 2077 L
+c10
+42 -158 -96 -35 3765 2112 3 MP
+PP
+0 sg
+3765 2112 mt 3669 2077 L
+3669 2077 mt 3711 1919 L
+c10
+45 -157 20 -34 3745 2146 3 MP
+PP
+0 sg
+3745 2146 mt 3765 2112 L
+3765 2112 mt 3810 1955 L
+/c12 { 0.875000 1.000000 0.125000 sr} bdef
+c12
+-42 -155 -99 -36 3810 1634 3 MP
+PP
+0 sg
+3810 1634 mt 3711 1598 L
+3711 1598 mt 3669 1443 L
+c10
+21 -36 44 -155 3745 2146 3 MP
+PP
+0 sg
+3745 2146 mt 3789 1991 L
+3789 1991 mt 3810 1955 L
+c8
+21 -36 -15 -161 3804 1831 3 MP
+PP
+0 sg
+3804 1831 mt 3789 1670 L
+3789 1670 mt 3810 1634 L
+c12
+-96 -34 -45 -157 3810 1634 3 MP
+PP
+0 sg
+3810 1634 mt 3765 1477 L
+3765 1477 mt 3669 1443 L
+c12
+-45 -157 21 -36 3789 1670 3 MP
+PP
+0 sg
+3789 1670 mt 3810 1634 L
+3810 1634 mt 3765 1477 L
+c10
+-209 -32 42 -158 3669 2077 3 MP
+PP
+0 sg
+3669 2077 mt 3711 1919 L
+3711 1919 mt 3502 1887 L
+c9
+15 -160 138 -32 3651 2023 3 MP
+PP
+0 sg
+3651 2023 mt 3789 1991 L
+3789 1991 mt 3804 1831 L
+c9
+12 -162 -209 -32 3711 1919 3 MP
+PP
+0 sg
+3711 1919 mt 3502 1887 L
+3502 1887 mt 3514 1725 L
+c9
+-211 -33 14 -161 3711 1919 3 MP
+PP
+0 sg
+3711 1919 mt 3725 1758 L
+3725 1758 mt 3514 1725 L
+c9
+140 -32 13 -160 3651 2023 3 MP
+PP
+0 sg
+3651 2023 mt 3664 1863 L
+3664 1863 mt 3804 1831 L
+c8
+-15 -161 140 -32 3664 1863 3 MP
+PP
+0 sg
+3664 1863 mt 3804 1831 L
+3804 1831 mt 3789 1670 L
+c8
+-209 -33 -14 -160 3725 1758 3 MP
+PP
+0 sg
+3725 1758 mt 3711 1598 L
+3711 1598 mt 3502 1565 L
+c8
+-12 -160 -211 -33 3725 1758 3 MP
+PP
+0 sg
+3725 1758 mt 3514 1725 L
+3514 1725 mt 3502 1565 L
+c8
+138 -32 -13 -161 3664 1863 3 MP
+PP
+0 sg
+3664 1863 mt 3651 1702 L
+3651 1702 mt 3789 1670 L
+c10
+33 -159 -200 -31 3669 2077 3 MP
+PP
+0 sg
+3669 2077 mt 3469 2046 L
+3469 2046 mt 3502 1887 L
+c11
+-200 -31 68 -151 3601 2228 3 MP
+PP
+0 sg
+3601 2228 mt 3669 2077 L
+3669 2077 mt 3469 2046 L
+c11
+68 -151 -89 -33 3690 2261 3 MP
+PP
+0 sg
+3690 2261 mt 3601 2228 L
+3601 2228 mt 3669 2077 L
+c10
+138 -32 40 -154 3611 2177 3 MP
+PP
+0 sg
+3611 2177 mt 3651 2023 L
+3651 2023 mt 3789 1991 L
+c10
+44 -155 134 -31 3611 2177 3 MP
+PP
+0 sg
+3611 2177 mt 3745 2146 L
+3745 2146 mt 3789 1991 L
+c12
+20 -35 -44 -158 3789 1670 3 MP
+PP
+0 sg
+3789 1670 mt 3745 1512 L
+3745 1512 mt 3765 1477 L
+c12
+-200 -32 -42 -155 3711 1598 3 MP
+PP
+0 sg
+3711 1598 mt 3669 1443 L
+3669 1443 mt 3469 1411 L
+c12
+-33 -154 -209 -33 3711 1598 3 MP
+PP
+0 sg
+3711 1598 mt 3502 1565 L
+3502 1565 mt 3469 1411 L
+c12
+-44 -158 138 -32 3651 1702 3 MP
+PP
+0 sg
+3651 1702 mt 3789 1670 L
+3789 1670 mt 3745 1512 L
+/c13 { 1.000000 0.875000 0.000000 sr} bdef
+c13
+-68 -147 -96 -34 3765 1477 3 MP
+PP
+0 sg
+3765 1477 mt 3669 1443 L
+3669 1443 mt 3601 1296 L
+c13
+-89 -32 -75 -149 3765 1477 3 MP
+PP
+0 sg
+3765 1477 mt 3690 1328 L
+3690 1328 mt 3601 1296 L
+/c14 { 0.000000 0.375000 1.000000 sr} bdef
+c14
+-89 -33 101 -137 3589 2398 3 MP
+PP
+0 sg
+3589 2398 mt 3690 2261 L
+3690 2261 mt 3601 2228 L
+c14
+18 -32 100 -134 3572 2427 3 MP
+PP
+0 sg
+3572 2427 mt 3672 2293 L
+3672 2293 mt 3690 2261 L
+c14
+101 -137 17 -29 3572 2427 3 MP
+PP
+0 sg
+3572 2427 mt 3589 2398 L
+3589 2398 mt 3690 2261 L
+c11
+20 -34 73 -147 3672 2293 3 MP
+PP
+0 sg
+3672 2293 mt 3745 2146 L
+3745 2146 mt 3765 2112 L
+c11
+75 -149 18 -32 3672 2293 3 MP
+PP
+0 sg
+3672 2293 mt 3690 2261 L
+3690 2261 mt 3765 2112 L
+c13
+-75 -149 20 -35 3745 1512 3 MP
+PP
+0 sg
+3745 1512 mt 3765 1477 L
+3765 1477 mt 3690 1328 L
+c14
+93 -140 -81 -30 3589 2398 3 MP
+PP
+0 sg
+3589 2398 mt 3508 2368 L
+3508 2368 mt 3601 2228 L
+c11
+73 -147 125 -29 3547 2322 3 MP
+PP
+0 sg
+3547 2322 mt 3672 2293 L
+3672 2293 mt 3745 2146 L
+c13
+18 -33 -73 -151 3745 1512 3 MP
+PP
+0 sg
+3745 1512 mt 3672 1361 L
+3672 1361 mt 3690 1328 L
+c14
+-188 -29 93 -140 3508 2368 3 MP
+PP
+0 sg
+3508 2368 mt 3601 2228 L
+3601 2228 mt 3413 2199 L
+c11
+56 -153 -188 -29 3601 2228 3 MP
+PP
+0 sg
+3601 2228 mt 3413 2199 L
+3413 2199 mt 3469 2046 L
+c11
+134 -31 64 -145 3547 2322 3 MP
+PP
+0 sg
+3547 2322 mt 3611 2177 L
+3611 2177 mt 3745 2146 L
+c12
+134 -31 -40 -159 3651 1702 3 MP
+PP
+0 sg
+3651 1702 mt 3611 1543 L
+3611 1543 mt 3745 1512 L
+c13
+-56 -144 -200 -32 3669 1443 3 MP
+PP
+0 sg
+3669 1443 mt 3469 1411 L
+3469 1411 mt 3413 1267 L
+c13
+-188 -29 -68 -147 3669 1443 3 MP
+PP
+0 sg
+3669 1443 mt 3601 1296 L
+3601 1296 mt 3413 1267 L
+c13
+-73 -151 134 -31 3611 1543 3 MP
+PP
+0 sg
+3611 1543 mt 3745 1512 L
+3745 1512 mt 3672 1361 L
+/c15 { 1.000000 0.562500 0.000000 sr} bdef
+c15
+-81 -30 -101 -137 3690 1328 3 MP
+PP
+0 sg
+3690 1328 mt 3589 1191 L
+3589 1191 mt 3508 1161 L
+c15
+-93 -135 -89 -32 3690 1328 3 MP
+PP
+0 sg
+3690 1328 mt 3601 1296 L
+3601 1296 mt 3508 1161 L
+c15
+-101 -137 18 -33 3672 1361 3 MP
+PP
+0 sg
+3672 1361 mt 3690 1328 L
+3690 1328 mt 3589 1191 L
+/c16 { 0.000000 0.125000 1.000000 sr} bdef
+c16
+116 -126 -71 -26 3463 2520 3 MP
+PP
+0 sg
+3463 2520 mt 3392 2494 L
+3392 2494 mt 3508 2368 L
+c16
+-81 -30 126 -122 3463 2520 3 MP
+PP
+0 sg
+3463 2520 mt 3589 2398 L
+3589 2398 mt 3508 2368 L
+c14
+125 -29 88 -132 3459 2454 3 MP
+PP
+0 sg
+3459 2454 mt 3547 2322 L
+3547 2322 mt 3672 2293 L
+c13
+125 -29 -64 -153 3611 1543 3 MP
+PP
+0 sg
+3611 1543 mt 3547 1390 L
+3547 1390 mt 3672 1361 L
+c15
+-76 -132 -188 -29 3601 1296 3 MP
+PP
+0 sg
+3601 1296 mt 3413 1267 L
+3413 1267 mt 3337 1135 L
+c15
+-171 -26 -93 -135 3601 1296 3 MP
+PP
+0 sg
+3601 1296 mt 3508 1161 L
+3508 1161 mt 3337 1135 L
+c15
+-100 -141 125 -29 3547 1390 3 MP
+PP
+0 sg
+3547 1390 mt 3672 1361 L
+3672 1361 mt 3572 1220 L
+c15
+17 -29 -100 -141 3672 1361 3 MP
+PP
+0 sg
+3672 1361 mt 3572 1220 L
+3572 1220 mt 3589 1191 L
+c16
+126 -122 15 -26 3448 2546 3 MP
+PP
+0 sg
+3448 2546 mt 3463 2520 L
+3463 2520 mt 3589 2398 L
+c16
+17 -29 124 -119 3448 2546 3 MP
+PP
+0 sg
+3448 2546 mt 3572 2427 L
+3572 2427 mt 3589 2398 L
+c14
+100 -134 113 -27 3459 2454 3 MP
+PP
+0 sg
+3459 2454 mt 3572 2427 L
+3572 2427 mt 3672 2293 L
+c11
+-287 -25 56 -153 3413 2199 3 MP
+PP
+0 sg
+3413 2199 mt 3469 2046 L
+3469 2046 mt 3182 2021 L
+c10
+22 -160 -287 -25 3469 2046 3 MP
+PP
+0 sg
+3469 2046 mt 3182 2021 L
+3182 2021 mt 3204 1861 L
+c10
+-298 -26 33 -159 3469 2046 3 MP
+PP
+0 sg
+3469 2046 mt 3502 1887 L
+3502 1887 mt 3204 1861 L
+c9
+13 -160 242 -26 3409 2049 3 MP
+PP
+0 sg
+3409 2049 mt 3651 2023 L
+3651 2023 mt 3664 1863 L
+c9
+8 -162 -298 -26 3502 1887 3 MP
+PP
+0 sg
+3502 1887 mt 3204 1861 L
+3204 1861 mt 3212 1699 L
+c9
+-302 -26 12 -162 3502 1887 3 MP
+PP
+0 sg
+3502 1887 mt 3514 1725 L
+3514 1725 mt 3212 1699 L
+c9
+245 -26 10 -160 3409 2049 3 MP
+PP
+0 sg
+3409 2049 mt 3419 1889 L
+3419 1889 mt 3664 1863 L
+c8
+-13 -161 245 -26 3419 1889 3 MP
+PP
+0 sg
+3419 1889 mt 3664 1863 L
+3664 1863 mt 3651 1702 L
+c14
+-269 -24 76 -143 3337 2342 3 MP
+PP
+0 sg
+3337 2342 mt 3413 2199 L
+3413 2199 mt 3144 2175 L
+c11
+38 -154 -269 -24 3413 2199 3 MP
+PP
+0 sg
+3413 2199 mt 3144 2175 L
+3144 2175 mt 3182 2021 L
+c10
+242 -26 31 -153 3378 2202 3 MP
+PP
+0 sg
+3378 2202 mt 3409 2049 L
+3409 2049 mt 3651 2023 L
+c8
+-298 -25 -12 -160 3514 1725 3 MP
+PP
+0 sg
+3514 1725 mt 3502 1565 L
+3502 1565 mt 3204 1540 L
+c8
+-8 -159 -302 -26 3514 1725 3 MP
+PP
+0 sg
+3514 1725 mt 3212 1699 L
+3212 1699 mt 3204 1540 L
+c8
+242 -25 -10 -162 3419 1889 3 MP
+PP
+0 sg
+3419 1889 mt 3409 1727 L
+3409 1727 mt 3651 1702 L
+c12
+-40 -159 242 -25 3409 1727 3 MP
+PP
+0 sg
+3409 1727 mt 3651 1702 L
+3651 1702 mt 3611 1543 L
+c10
+40 -154 233 -25 3378 2202 3 MP
+PP
+0 sg
+3378 2202 mt 3611 2177 L
+3611 2177 mt 3651 2023 L
+c14
+51 -145 -244 -22 3337 2342 3 MP
+PP
+0 sg
+3337 2342 mt 3093 2320 L
+3093 2320 mt 3144 2175 L
+c16
+-244 -22 94 -129 3243 2471 3 MP
+PP
+0 sg
+3243 2471 mt 3337 2342 L
+3337 2342 mt 3093 2320 L
+c14
+76 -143 -171 -26 3508 2368 3 MP
+PP
+0 sg
+3508 2368 mt 3337 2342 L
+3337 2342 mt 3413 2199 L
+c11
+233 -25 50 -143 3328 2345 3 MP
+PP
+0 sg
+3328 2345 mt 3378 2202 L
+3378 2202 mt 3611 2177 L
+c16
+94 -129 -149 -23 3392 2494 3 MP
+PP
+0 sg
+3392 2494 mt 3243 2471 L
+3243 2471 mt 3337 2342 L
+c16
+-171 -26 116 -126 3392 2494 3 MP
+PP
+0 sg
+3392 2494 mt 3508 2368 L
+3508 2368 mt 3337 2342 L
+c11
+64 -145 219 -23 3328 2345 3 MP
+PP
+0 sg
+3328 2345 mt 3547 2322 L
+3547 2322 mt 3611 2177 L
+c12
+-287 -25 -33 -154 3502 1565 3 MP
+PP
+0 sg
+3502 1565 mt 3469 1411 L
+3469 1411 mt 3182 1386 L
+c12
+-22 -154 -298 -25 3502 1565 3 MP
+PP
+0 sg
+3502 1565 mt 3204 1540 L
+3204 1540 mt 3182 1386 L
+c13
+-64 -153 233 -24 3378 1567 3 MP
+PP
+0 sg
+3378 1567 mt 3611 1543 L
+3611 1543 mt 3547 1390 L
+c12
+233 -24 -31 -160 3409 1727 3 MP
+PP
+0 sg
+3409 1727 mt 3378 1567 L
+3378 1567 mt 3611 1543 L
+/c17 { 1.000000 0.312500 0.000000 sr} bdef
+c17
+-116 -118 -81 -30 3589 1191 3 MP
+PP
+0 sg
+3589 1191 mt 3508 1161 L
+3508 1161 mt 3392 1043 L
+c17
+-71 -25 -126 -123 3589 1191 3 MP
+PP
+0 sg
+3589 1191 mt 3463 1068 L
+3463 1068 mt 3392 1043 L
+c17
+-126 -123 17 -29 3572 1220 3 MP
+PP
+0 sg
+3572 1220 mt 3589 1191 L
+3589 1191 mt 3463 1068 L
+c17
+-94 -116 -171 -26 3508 1161 3 MP
+PP
+0 sg
+3508 1161 mt 3337 1135 L
+3337 1135 mt 3243 1019 L
+c17
+-149 -24 -116 -118 3508 1161 3 MP
+PP
+0 sg
+3508 1161 mt 3392 1043 L
+3392 1043 mt 3243 1019 L
+c17
+-124 -126 113 -27 3459 1247 3 MP
+PP
+0 sg
+3459 1247 mt 3572 1220 L
+3572 1220 mt 3448 1094 L
+c17
+15 -26 -124 -126 3572 1220 3 MP
+PP
+0 sg
+3572 1220 mt 3448 1094 L
+3448 1094 mt 3463 1068 L
+/c18 { 0.000000 0.000000 0.937500 sr} bdef
+c18
+15 -26 145 -100 3303 2646 3 MP
+PP
+0 sg
+3303 2646 mt 3448 2546 L
+3448 2546 mt 3463 2520 L
+c18
+-71 -26 147 -105 3316 2625 3 MP
+PP
+0 sg
+3316 2625 mt 3463 2520 L
+3463 2520 mt 3392 2494 L
+c18
+147 -105 13 -21 3303 2646 3 MP
+PP
+0 sg
+3303 2646 mt 3316 2625 L
+3316 2625 mt 3463 2520 L
+c16
+124 -119 99 -23 3349 2569 3 MP
+PP
+0 sg
+3349 2569 mt 3448 2546 L
+3448 2546 mt 3572 2427 L
+c15
+113 -27 -88 -143 3547 1390 3 MP
+PP
+0 sg
+3547 1390 mt 3459 1247 L
+3459 1247 mt 3572 1220 L
+c16
+113 -27 110 -115 3349 2569 3 MP
+PP
+0 sg
+3349 2569 mt 3459 2454 L
+3459 2454 mt 3572 2427 L
+c18
+-149 -23 135 -109 3257 2603 3 MP
+PP
+0 sg
+3257 2603 mt 3392 2494 L
+3392 2494 mt 3243 2471 L
+c14
+88 -132 199 -20 3260 2474 3 MP
+PP
+0 sg
+3260 2474 mt 3459 2454 L
+3459 2454 mt 3547 2322 L
+c14
+219 -23 68 -129 3260 2474 3 MP
+PP
+0 sg
+3260 2474 mt 3328 2345 L
+3328 2345 mt 3547 2322 L
+c13
+-269 -24 -56 -144 3469 1411 3 MP
+PP
+0 sg
+3469 1411 mt 3413 1267 L
+3413 1267 mt 3144 1243 L
+c13
+-38 -143 -287 -25 3469 1411 3 MP
+PP
+0 sg
+3469 1411 mt 3182 1386 L
+3182 1386 mt 3144 1243 L
+c15
+-88 -143 219 -23 3328 1413 3 MP
+PP
+0 sg
+3328 1413 mt 3547 1390 L
+3547 1390 mt 3459 1247 L
+c13
+219 -23 -50 -154 3378 1567 3 MP
+PP
+0 sg
+3378 1567 mt 3328 1413 L
+3328 1413 mt 3547 1390 L
+/c19 { 1.000000 0.062500 0.000000 sr} bdef
+c19
+-135 -101 -71 -25 3463 1068 3 MP
+PP
+0 sg
+3463 1068 mt 3392 1043 L
+3392 1043 mt 3257  942 L
+c19
+-59 -22 -147 -104 3463 1068 3 MP
+PP
+0 sg
+3463 1068 mt 3316  964 L
+3316  964 mt 3257  942 L
+c19
+-147 -104 15 -26 3448 1094 3 MP
+PP
+0 sg
+3448 1094 mt 3463 1068 L
+3463 1068 mt 3316  964 L
+c18
+110 -113 -124 -19 3257 2603 3 MP
+PP
+0 sg
+3257 2603 mt 3133 2584 L
+3133 2584 mt 3243 2471 L
+c18
+135 -109 -59 -22 3316 2625 3 MP
+PP
+0 sg
+3316 2625 mt 3257 2603 L
+3257 2603 mt 3392 2494 L
+c16
+110 -115 173 -18 3176 2587 3 MP
+PP
+0 sg
+3176 2587 mt 3349 2569 L
+3349 2569 mt 3459 2454 L
+c15
+-244 -21 -76 -132 3413 1267 3 MP
+PP
+0 sg
+3413 1267 mt 3337 1135 L
+3337 1135 mt 3093 1114 L
+c15
+-51 -129 -269 -24 3413 1267 3 MP
+PP
+0 sg
+3413 1267 mt 3144 1243 L
+3144 1243 mt 3093 1114 L
+c15
+199 -21 -68 -145 3328 1413 3 MP
+PP
+0 sg
+3328 1413 mt 3260 1268 L
+3260 1268 mt 3459 1247 L
+c16
+199 -20 84 -113 3176 2587 3 MP
+PP
+0 sg
+3176 2587 mt 3260 2474 L
+3260 2474 mt 3459 2454 L
+c17
+99 -23 -110 -130 3459 1247 3 MP
+PP
+0 sg
+3459 1247 mt 3349 1117 L
+3349 1117 mt 3448 1094 L
+c17
+-110 -130 199 -21 3260 1268 3 MP
+PP
+0 sg
+3260 1268 mt 3459 1247 L
+3459 1247 mt 3349 1117 L
+c19
+-124 -19 -135 -101 3392 1043 3 MP
+PP
+0 sg
+3392 1043 mt 3257  942 L
+3257  942 mt 3133  923 L
+c19
+-110 -96 -149 -24 3392 1043 3 MP
+PP
+0 sg
+3392 1043 mt 3243 1019 L
+3243 1019 mt 3133  923 L
+c19
+-145 -109 99 -23 3349 1117 3 MP
+PP
+0 sg
+3349 1117 mt 3448 1094 L
+3448 1094 mt 3303  985 L
+c19
+13 -21 -145 -109 3448 1094 3 MP
+PP
+0 sg
+3448 1094 mt 3303  985 L
+3303  985 mt 3316  964 L
+/c20 { 0.000000 0.000000 0.750000 sr} bdef
+c20
+-59 -22 166 -84 3150 2709 3 MP
+PP
+0 sg
+3150 2709 mt 3316 2625 L
+3316 2625 mt 3257 2603 L
+c20
+13 -21 162 -79 3141 2725 3 MP
+PP
+0 sg
+3141 2725 mt 3303 2646 L
+3303 2646 mt 3316 2625 L
+c20
+166 -84 9 -16 3141 2725 3 MP
+PP
+0 sg
+3141 2725 mt 3150 2709 L
+3150 2709 mt 3316 2625 L
+c18
+145 -100 82 -19 3221 2665 3 MP
+PP
+0 sg
+3221 2665 mt 3303 2646 L
+3303 2646 mt 3448 2546 L
+c18
+99 -23 128 -96 3221 2665 3 MP
+PP
+0 sg
+3221 2665 mt 3349 2569 L
+3349 2569 mt 3448 2546 L
+c10
+9 -161 -345 -16 3182 2021 3 MP
+PP
+0 sg
+3182 2021 mt 2837 2005 L
+2837 2005 mt 2846 1844 L
+c11
+-345 -16 38 -154 3144 2175 3 MP
+PP
+0 sg
+3144 2175 mt 3182 2021 L
+3182 2021 mt 2837 2005 L
+c10
+-358 -17 22 -160 3182 2021 3 MP
+PP
+0 sg
+3182 2021 mt 3204 1861 L
+3204 1861 mt 2846 1844 L
+c9
+10 -160 323 -16 3086 2065 3 MP
+PP
+0 sg
+3086 2065 mt 3409 2049 L
+3409 2049 mt 3419 1889 L
+c9
+3 -162 -358 -17 3204 1861 3 MP
+PP
+0 sg
+3204 1861 mt 2846 1844 L
+2846 1844 mt 2849 1682 L
+c9
+-363 -17 8 -162 3204 1861 3 MP
+PP
+0 sg
+3204 1861 mt 3212 1699 L
+3212 1699 mt 2849 1682 L
+c8
+-10 -162 327 -17 3092 1906 3 MP
+PP
+0 sg
+3092 1906 mt 3419 1889 L
+3419 1889 mt 3409 1727 L
+c9
+327 -17 6 -159 3086 2065 3 MP
+PP
+0 sg
+3086 2065 mt 3092 1906 L
+3092 1906 mt 3419 1889 L
+c11
+16 -155 -323 -15 3144 2175 3 MP
+PP
+0 sg
+3144 2175 mt 2821 2160 L
+2821 2160 mt 2837 2005 L
+c14
+-323 -15 51 -145 3093 2320 3 MP
+PP
+0 sg
+3093 2320 mt 3144 2175 L
+3144 2175 mt 2821 2160 L
+c10
+323 -16 18 -152 3068 2217 3 MP
+PP
+0 sg
+3068 2217 mt 3086 2065 L
+3086 2065 mt 3409 2049 L
+c10
+31 -153 310 -15 3068 2217 3 MP
+PP
+0 sg
+3068 2217 mt 3378 2202 L
+3378 2202 mt 3409 2049 L
+c8
+323 -17 -6 -162 3092 1906 3 MP
+PP
+0 sg
+3092 1906 mt 3086 1744 L
+3086 1744 mt 3409 1727 L
+c8
+-358 -17 -8 -159 3212 1699 3 MP
+PP
+0 sg
+3212 1699 mt 3204 1540 L
+3204 1540 mt 2846 1523 L
+c8
+-3 -159 -363 -17 3212 1699 3 MP
+PP
+0 sg
+3212 1699 mt 2849 1682 L
+2849 1682 mt 2846 1523 L
+c12
+-31 -160 323 -17 3086 1744 3 MP
+PP
+0 sg
+3086 1744 mt 3409 1727 L
+3409 1727 mt 3378 1567 L
+c14
+21 -147 -293 -13 3093 2320 3 MP
+PP
+0 sg
+3093 2320 mt 2800 2307 L
+2800 2307 mt 2821 2160 L
+c16
+-293 -13 63 -133 3030 2453 3 MP
+PP
+0 sg
+3030 2453 mt 3093 2320 L
+3093 2320 mt 2800 2307 L
+c16
+63 -133 -213 -18 3243 2471 3 MP
+PP
+0 sg
+3243 2471 mt 3030 2453 L
+3030 2453 mt 3093 2320 L
+c11
+310 -15 30 -142 3038 2359 3 MP
+PP
+0 sg
+3038 2359 mt 3068 2217 L
+3068 2217 mt 3378 2202 L
+c12
+-345 -16 -22 -154 3204 1540 3 MP
+PP
+0 sg
+3204 1540 mt 3182 1386 L
+3182 1386 mt 2837 1370 L
+c12
+-9 -153 -358 -17 3204 1540 3 MP
+PP
+0 sg
+3204 1540 mt 2846 1523 L
+2846 1523 mt 2837 1370 L
+c13
+-50 -154 310 -16 3068 1583 3 MP
+PP
+0 sg
+3068 1583 mt 3378 1567 L
+3378 1567 mt 3328 1413 L
+c12
+310 -16 -18 -161 3086 1744 3 MP
+PP
+0 sg
+3086 1744 mt 3068 1583 L
+3068 1583 mt 3378 1567 L
+c11
+50 -143 290 -14 3038 2359 3 MP
+PP
+0 sg
+3038 2359 mt 3328 2345 L
+3328 2345 mt 3378 2202 L
+c20
+124 -93 -96 -15 3105 2692 3 MP
+PP
+0 sg
+3105 2692 mt 3009 2677 L
+3009 2677 mt 3133 2584 L
+c20
+152 -89 -45 -17 3150 2709 3 MP
+PP
+0 sg
+3150 2709 mt 3105 2692 L
+3105 2692 mt 3257 2603 L
+c20
+-124 -19 152 -89 3105 2692 3 MP
+PP
+0 sg
+3105 2692 mt 3257 2603 L
+3257 2603 mt 3133 2584 L
+c18
+173 -18 99 -93 3077 2680 3 MP
+PP
+0 sg
+3077 2680 mt 3176 2587 L
+3176 2587 mt 3349 2569 L
+c18
+128 -96 144 -15 3077 2680 3 MP
+PP
+0 sg
+3077 2680 mt 3221 2665 L
+3221 2665 mt 3349 2569 L
+c17
+-63 -113 -244 -21 3337 1135 3 MP
+PP
+0 sg
+3337 1135 mt 3093 1114 L
+3093 1114 mt 3030 1001 L
+c17
+-213 -18 -94 -116 3337 1135 3 MP
+PP
+0 sg
+3337 1135 mt 3243 1019 L
+3243 1019 mt 3030 1001 L
+c17
+173 -18 -84 -133 3260 1268 3 MP
+PP
+0 sg
+3260 1268 mt 3176 1135 L
+3176 1135 mt 3349 1117 L
+c19
+-75 -94 -213 -18 3243 1019 3 MP
+PP
+0 sg
+3243 1019 mt 3030 1001 L
+3030 1001 mt 2955  907 L
+c19
+-178 -16 -110 -96 3243 1019 3 MP
+PP
+0 sg
+3243 1019 mt 3133  923 L
+3133  923 mt 2955  907 L
+c19
+-128 -113 173 -18 3176 1135 3 MP
+PP
+0 sg
+3176 1135 mt 3349 1117 L
+3349 1117 mt 3221 1004 L
+c19
+82 -19 -128 -113 3349 1117 3 MP
+PP
+0 sg
+3349 1117 mt 3221 1004 L
+3221 1004 mt 3303  985 L
+c18
+-257 -12 75 -116 2955 2569 3 MP
+PP
+0 sg
+2955 2569 mt 3030 2453 L
+3030 2453 mt 2773 2441 L
+c18
+75 -116 -178 -15 3133 2584 3 MP
+PP
+0 sg
+3133 2584 mt 2955 2569 L
+2955 2569 mt 3030 2453 L
+c18
+-213 -18 110 -113 3133 2584 3 MP
+PP
+0 sg
+3133 2584 mt 3243 2471 L
+3243 2471 mt 3030 2453 L
+c14
+68 -129 264 -14 2996 2488 3 MP
+PP
+0 sg
+2996 2488 mt 3260 2474 L
+3260 2474 mt 3328 2345 L
+c13
+-16 -142 -345 -16 3182 1386 3 MP
+PP
+0 sg
+3182 1386 mt 2837 1370 L
+2837 1370 mt 2821 1228 L
+c13
+-323 -15 -38 -143 3182 1386 3 MP
+PP
+0 sg
+3182 1386 mt 3144 1243 L
+3144 1243 mt 2821 1228 L
+c15
+-68 -145 290 -14 3038 1427 3 MP
+PP
+0 sg
+3038 1427 mt 3328 1413 L
+3328 1413 mt 3260 1268 L
+c16
+27 -134 -257 -12 3030 2453 3 MP
+PP
+0 sg
+3030 2453 mt 2773 2441 L
+2773 2441 mt 2800 2307 L
+c14
+290 -14 42 -129 2996 2488 3 MP
+PP
+0 sg
+2996 2488 mt 3038 2359 L
+3038 2359 mt 3328 2345 L
+c13
+290 -14 -30 -156 3068 1583 3 MP
+PP
+0 sg
+3068 1583 mt 3038 1427 L
+3038 1427 mt 3328 1413 L
+/c21 { 0.875000 0.000000 0.000000 sr} bdef
+c21
+-124 -75 -124 -19 3257 942 3 MP
+PP
+0 sg
+3257  942 mt 3133  923 L
+3133  923 mt 3009  848 L
+c21
+-96 -15 -152 -79 3257 942 3 MP
+PP
+0 sg
+3257  942 mt 3105  863 L
+3105  863 mt 3009  848 L
+c21
+-45 -16 -166 -85 3316 964 3 MP
+PP
+0 sg
+3316  964 mt 3150  879 L
+3150  879 mt 3105  863 L
+c21
+-152 -79 -59 -22 3316 964 3 MP
+PP
+0 sg
+3316  964 mt 3257  942 L
+3257  942 mt 3105  863 L
+c21
+-166 -85 13 -21 3303 985 3 MP
+PP
+0 sg
+3303  985 mt 3316  964 L
+3316  964 mt 3150  879 L
+c21
+9 -17 -162 -89 3303 985 3 MP
+PP
+0 sg
+3303  985 mt 3141  896 L
+3141  896 mt 3150  879 L
+c21
+-162 -89 82 -19 3221 1004 3 MP
+PP
+0 sg
+3221 1004 mt 3303  985 L
+3303  985 mt 3141  896 L
+/c22 { 0.000000 0.000000 0.625000 sr} bdef
+c22
+9 -16 177 -56 2964 2781 3 MP
+PP
+0 sg
+2964 2781 mt 3141 2725 L
+3141 2725 mt 3150 2709 L
+c22
+179 -61 7 -11 2964 2781 3 MP
+PP
+0 sg
+2964 2781 mt 2971 2770 L
+2971 2770 mt 3150 2709 L
+c22
+-45 -17 179 -61 2971 2770 3 MP
+PP
+0 sg
+2971 2770 mt 3150 2709 L
+3150 2709 mt 3105 2692 L
+c20
+82 -19 144 -75 3077 2740 3 MP
+PP
+0 sg
+3077 2740 mt 3221 2665 L
+3221 2665 mt 3303 2646 L
+c20
+162 -79 64 -15 3077 2740 3 MP
+PP
+0 sg
+3077 2740 mt 3141 2725 L
+3141 2725 mt 3303 2646 L
+c20
+83 -96 -137 -12 3009 2677 3 MP
+PP
+0 sg
+3009 2677 mt 2872 2665 L
+2872 2665 mt 2955 2569 L
+c20
+-178 -15 124 -93 3009 2677 3 MP
+PP
+0 sg
+3009 2677 mt 3133 2584 L
+3133 2584 mt 2955 2569 L
+c16
+84 -113 231 -12 2945 2599 3 MP
+PP
+0 sg
+2945 2599 mt 3176 2587 L
+3176 2587 mt 3260 2474 L
+c15
+-21 -128 -323 -15 3144 1243 3 MP
+PP
+0 sg
+3144 1243 mt 2821 1228 L
+2821 1228 mt 2800 1100 L
+c15
+-293 -14 -51 -129 3144 1243 3 MP
+PP
+0 sg
+3144 1243 mt 3093 1114 L
+3093 1114 mt 2800 1100 L
+c17
+-84 -133 264 -13 2996 1281 3 MP
+PP
+0 sg
+2996 1281 mt 3260 1268 L
+3260 1268 mt 3176 1135 L
+c15
+264 -13 -42 -146 3038 1427 3 MP
+PP
+0 sg
+3038 1427 mt 2996 1281 L
+2996 1281 mt 3260 1268 L
+c16
+264 -14 51 -111 2945 2599 3 MP
+PP
+0 sg
+2945 2599 mt 2996 2488 L
+2996 2488 mt 3260 2474 L
+c21
+-137 -12 -124 -75 3133 923 3 MP
+PP
+0 sg
+3133  923 mt 3009  848 L
+3009  848 mt 2872  836 L
+c21
+-83 -71 -178 -16 3133 923 3 MP
+PP
+0 sg
+3133  923 mt 2955  907 L
+2955  907 mt 2872  836 L
+c21
+64 -15 -144 -93 3221 1004 3 MP
+PP
+0 sg
+3221 1004 mt 3077  911 L
+3077  911 mt 3141  896 L
+c21
+-144 -93 144 -15 3077 1019 3 MP
+PP
+0 sg
+3077 1019 mt 3221 1004 L
+3221 1004 mt 3077  911 L
+c19
+144 -15 -99 -116 3176 1135 3 MP
+PP
+0 sg
+3176 1135 mt 3077 1019 L
+3077 1019 mt 3221 1004 L
+c22
+165 -67 -31 -11 2971 2770 3 MP
+PP
+0 sg
+2971 2770 mt 2940 2759 L
+2940 2759 mt 3105 2692 L
+c20
+144 -75 111 -12 2966 2752 3 MP
+PP
+0 sg
+2966 2752 mt 3077 2740 L
+3077 2740 mt 3221 2665 L
+c22
+-96 -15 165 -67 2940 2759 3 MP
+PP
+0 sg
+2940 2759 mt 3105 2692 L
+3105 2692 mt 3009 2677 L
+c20
+144 -15 111 -72 2966 2752 3 MP
+PP
+0 sg
+2966 2752 mt 3077 2680 L
+3077 2680 mt 3221 2665 L
+c17
+231 -12 -51 -134 2996 1281 3 MP
+PP
+0 sg
+2996 1281 mt 2945 1147 L
+2945 1147 mt 3176 1135 L
+c17
+-257 -12 -63 -113 3093 1114 3 MP
+PP
+0 sg
+3093 1114 mt 3030 1001 L
+3030 1001 mt 2773  989 L
+c17
+-27 -111 -293 -14 3093 1114 3 MP
+PP
+0 sg
+3093 1114 mt 2800 1100 L
+2800 1100 mt 2773  989 L
+c19
+-99 -116 231 -12 2945 1147 3 MP
+PP
+0 sg
+2945 1147 mt 3176 1135 L
+3176 1135 mt 3077 1019 L
+c22
+-137 -12 134 -72 2875 2749 3 MP
+PP
+0 sg
+2875 2749 mt 3009 2677 L
+3009 2677 mt 2872 2665 L
+c18
+231 -12 60 -91 2885 2690 3 MP
+PP
+0 sg
+2885 2690 mt 2945 2599 L
+2945 2599 mt 3176 2587 L
+c22
+134 -72 -65 -10 2940 2759 3 MP
+PP
+0 sg
+2940 2759 mt 2875 2749 L
+2875 2749 mt 3009 2677 L
+c18
+99 -93 192 -10 2885 2690 3 MP
+PP
+0 sg
+2885 2690 mt 3077 2680 L
+3077 2680 mt 3176 2587 L
+/c23 { 0.687500 0.000000 0.000000 sr} bdef
+c23
+-134 -52 -96 -15 3105 863 3 MP
+PP
+0 sg
+3105  863 mt 3009  848 L
+3009  848 mt 2875  796 L
+c23
+-65 -10 -165 -57 3105 863 3 MP
+PP
+0 sg
+3105  863 mt 2940  806 L
+2940  806 mt 2875  796 L
+c23
+-165 -57 -45 -16 3150 879 3 MP
+PP
+0 sg
+3150  879 mt 3105  863 L
+3105  863 mt 2940  806 L
+c23
+-179 -62 9 -17 3141 896 3 MP
+PP
+0 sg
+3141  896 mt 3150  879 L
+3150  879 mt 2971  817 L
+c23
+-31 -11 -179 -62 3150 879 3 MP
+PP
+0 sg
+3150  879 mt 2971  817 L
+2971  817 mt 2940  806 L
+c23
+7 -12 -177 -67 3141 896 3 MP
+PP
+0 sg
+3141  896 mt 2964  829 L
+2964  829 mt 2971  817 L
+/c24 { 0.000000 0.000000 0.562500 sr} bdef
+c24
+185 -32 22 -5 2757 2818 3 MP
+PP
+0 sg
+2757 2818 mt 2779 2813 L
+2779 2813 mt 2964 2781 L
+c24
+43 -10 164 -27 2757 2818 3 MP
+PP
+0 sg
+2757 2818 mt 2921 2791 L
+2921 2791 mt 2964 2781 L
+c24
+7 -11 185 -32 2779 2813 3 MP
+PP
+0 sg
+2779 2813 mt 2964 2781 L
+2964 2781 mt 2971 2770 L
+c22
+64 -15 156 -51 2921 2791 3 MP
+PP
+0 sg
+2921 2791 mt 3077 2740 L
+3077 2740 mt 3141 2725 L
+c22
+177 -56 43 -10 2921 2791 3 MP
+PP
+0 sg
+2921 2791 mt 2964 2781 L
+2964 2781 mt 3141 2725 L
+c23
+-93 -8 -134 -52 3009 848 3 MP
+PP
+0 sg
+3009  848 mt 2875  796 L
+2875  796 mt 2782  788 L
+c23
+-90 -48 -137 -12 3009 848 3 MP
+PP
+0 sg
+3009  848 mt 2872  836 L
+2872  836 mt 2782  788 L
+c23
+-177 -67 64 -15 3077 911 3 MP
+PP
+0 sg
+3077  911 mt 3141  896 L
+3141  896 mt 2964  829 L
+c10
+-383 -6 9 -161 2837 2005 3 MP
+PP
+0 sg
+2837 2005 mt 2846 1844 L
+2846 1844 mt 2463 1838 L
+c8
+-6 -162 375 -5 2717 1911 3 MP
+PP
+0 sg
+2717 1911 mt 3092 1906 L
+3092 1906 mt 3086 1744 L
+c11
+-370 -6 16 -155 2821 2160 3 MP
+PP
+0 sg
+2821 2160 mt 2837 2005 L
+2837 2005 mt 2467 1999 L
+c9
+6 -159 371 -5 2715 2070 3 MP
+PP
+0 sg
+2715 2070 mt 3086 2065 L
+3086 2065 mt 3092 1906 L
+c10
+-4 -161 -370 -6 2837 2005 3 MP
+PP
+0 sg
+2837 2005 mt 2467 1999 L
+2467 1999 mt 2463 1838 L
+c9
+375 -5 2 -159 2715 2070 3 MP
+PP
+0 sg
+2715 2070 mt 2717 1911 L
+2717 1911 mt 3092 1906 L
+c9
+-388 -6 3 -162 2846 1844 3 MP
+PP
+0 sg
+2846 1844 mt 2849 1682 L
+2849 1682 mt 2461 1676 L
+c12
+-18 -161 371 -5 2715 1749 3 MP
+PP
+0 sg
+2715 1749 mt 3086 1744 L
+3086 1744 mt 3068 1583 L
+c14
+-346 -5 21 -147 2800 2307 3 MP
+PP
+0 sg
+2800 2307 mt 2821 2160 L
+2821 2160 mt 2475 2155 L
+c10
+18 -152 357 -6 2711 2223 3 MP
+PP
+0 sg
+2711 2223 mt 3068 2217 L
+3068 2217 mt 3086 2065 L
+c11
+-8 -156 -346 -5 2821 2160 3 MP
+PP
+0 sg
+2821 2160 mt 2475 2155 L
+2475 2155 mt 2467 1999 L
+c10
+371 -5 4 -153 2711 2223 3 MP
+PP
+0 sg
+2711 2223 mt 2715 2070 L
+2715 2070 mt 3086 2065 L
+c9
+-2 -162 -383 -6 2846 1844 3 MP
+PP
+0 sg
+2846 1844 mt 2463 1838 L
+2463 1838 mt 2461 1676 L
+c8
+371 -5 -2 -162 2717 1911 3 MP
+PP
+0 sg
+2717 1911 mt 2715 1749 L
+2715 1749 mt 3086 1744 L
+c19
+-213 -10 -75 -94 3030 1001 3 MP
+PP
+0 sg
+3030 1001 mt 2955  907 L
+2955  907 mt 2742  897 L
+c21
+111 -11 -111 -97 3077 1019 3 MP
+PP
+0 sg
+3077 1019 mt 2966  922 L
+2966  922 mt 3077  911 L
+c24
+-31 -11 189 -38 2782 2808 3 MP
+PP
+0 sg
+2782 2808 mt 2971 2770 L
+2971 2770 mt 2940 2759 L
+c24
+189 -38 3 -5 2779 2813 3 MP
+PP
+0 sg
+2779 2813 mt 2782 2808 L
+2782 2808 mt 2971 2770 L
+c22
+156 -51 76 -8 2845 2799 3 MP
+PP
+0 sg
+2845 2799 mt 2921 2791 L
+2921 2791 mt 3077 2740 L
+c23
+43 -10 -156 -72 3077 911 3 MP
+PP
+0 sg
+3077  911 mt 2921  839 L
+2921  839 mt 2964  829 L
+c22
+111 -12 121 -47 2845 2799 3 MP
+PP
+0 sg
+2845 2799 mt 2966 2752 L
+2966 2752 mt 3077 2740 L
+c23
+-156 -72 111 -11 2966 922 3 MP
+PP
+0 sg
+2966  922 mt 3077  911 L
+3077  911 mt 2921  839 L
+c19
+192 -10 -60 -118 2945 1147 3 MP
+PP
+0 sg
+2945 1147 mt 2885 1029 L
+2885 1029 mt 3077 1019 L
+c19
+-31 -92 -257 -12 3030 1001 3 MP
+PP
+0 sg
+3030 1001 mt 2773  989 L
+2773  989 mt 2742  897 L
+c21
+-111 -97 192 -10 2885 1029 3 MP
+PP
+0 sg
+2885 1029 mt 3077 1019 L
+3077 1019 mt 2966  922 L
+c22
+90 -76 -93 -8 2875 2749 3 MP
+PP
+0 sg
+2875 2749 mt 2782 2741 L
+2782 2741 mt 2872 2665 L
+c24
+141 -48 -33 -5 2767 2802 3 MP
+PP
+0 sg
+2767 2802 mt 2734 2797 L
+2734 2797 mt 2875 2749 L
+c24
+-93 -8 141 -48 2734 2797 3 MP
+PP
+0 sg
+2734 2797 mt 2875 2749 L
+2875 2749 mt 2782 2741 L
+c24
+-65 -10 173 -43 2767 2802 3 MP
+PP
+0 sg
+2767 2802 mt 2940 2759 L
+2940 2759 mt 2875 2749 L
+c20
+111 -72 148 -7 2818 2759 3 MP
+PP
+0 sg
+2818 2759 mt 2966 2752 L
+2966 2752 mt 3077 2680 L
+c20
+192 -10 67 -69 2818 2759 3 MP
+PP
+0 sg
+2818 2759 mt 2885 2690 L
+2885 2690 mt 3077 2680 L
+c8
+-383 -6 -3 -159 2849 1682 3 MP
+PP
+0 sg
+2849 1682 mt 2846 1523 L
+2846 1523 mt 2463 1517 L
+c8
+2 -159 -388 -6 2849 1682 3 MP
+PP
+0 sg
+2849 1682 mt 2461 1676 L
+2461 1676 mt 2463 1517 L
+c12
+357 -5 -4 -161 2715 1749 3 MP
+PP
+0 sg
+2715 1749 mt 2711 1588 L
+2711 1588 mt 3068 1583 L
+c12
+4 -153 -383 -6 2846 1523 3 MP
+PP
+0 sg
+2846 1523 mt 2463 1517 L
+2463 1517 mt 2467 1364 L
+c12
+-370 -6 -9 -153 2846 1523 3 MP
+PP
+0 sg
+2846 1523 mt 2837 1370 L
+2837 1370 mt 2467 1364 L
+c13
+-30 -156 357 -5 2711 1588 3 MP
+PP
+0 sg
+2711 1588 mt 3068 1583 L
+3068 1583 mt 3038 1427 L
+c14
+-11 -147 -314 -5 2800 2307 3 MP
+PP
+0 sg
+2800 2307 mt 2486 2302 L
+2486 2302 mt 2475 2155 L
+c16
+-314 -5 27 -134 2773 2441 3 MP
+PP
+0 sg
+2773 2441 mt 2800 2307 L
+2800 2307 mt 2486 2302 L
+c11
+357 -6 8 -141 2703 2364 3 MP
+PP
+0 sg
+2703 2364 mt 2711 2223 L
+2711 2223 mt 3068 2217 L
+c11
+30 -142 335 -5 2703 2364 3 MP
+PP
+0 sg
+2703 2364 mt 3038 2359 L
+3038 2359 mt 3068 2217 L
+c13
+335 -5 -8 -156 2711 1588 3 MP
+PP
+0 sg
+2711 1588 mt 2703 1432 L
+2703 1432 mt 3038 1427 L
+c16
+-13 -134 -274 -5 2773 2441 3 MP
+PP
+0 sg
+2773 2441 mt 2499 2436 L
+2499 2436 mt 2486 2302 L
+c18
+-274 -5 31 -118 2742 2559 3 MP
+PP
+0 sg
+2742 2559 mt 2773 2441 L
+2773 2441 mt 2499 2436 L
+c18
+31 -118 -213 -10 2955 2569 3 MP
+PP
+0 sg
+2955 2569 mt 2742 2559 L
+2742 2559 mt 2773 2441 L
+c14
+335 -5 11 -128 2692 2492 3 MP
+PP
+0 sg
+2692 2492 mt 2703 2364 L
+2703 2364 mt 3038 2359 L
+c14
+42 -129 304 -4 2692 2492 3 MP
+PP
+0 sg
+2692 2492 mt 2996 2488 L
+2996 2488 mt 3038 2359 L
+c13
+8 -141 -370 -6 2837 1370 3 MP
+PP
+0 sg
+2837 1370 mt 2467 1364 L
+2467 1364 mt 2475 1223 L
+c13
+-346 -5 -16 -142 2837 1370 3 MP
+PP
+0 sg
+2837 1370 mt 2821 1228 L
+2821 1228 mt 2475 1223 L
+c15
+-42 -146 335 -5 2703 1432 3 MP
+PP
+0 sg
+2703 1432 mt 3038 1427 L
+3038 1427 mt 2996 1281 L
+c20
+-228 -4 35 -99 2707 2658 3 MP
+PP
+0 sg
+2707 2658 mt 2742 2559 L
+2742 2559 mt 2514 2555 L
+c20
+35 -99 -165 -7 2872 2665 3 MP
+PP
+0 sg
+2872 2665 mt 2707 2658 L
+2707 2658 mt 2742 2559 L
+c20
+-213 -10 83 -96 2872 2665 3 MP
+PP
+0 sg
+2872 2665 mt 2955 2569 L
+2955 2569 mt 2742 2559 L
+c16
+51 -111 266 -4 2679 2603 3 MP
+PP
+0 sg
+2679 2603 mt 2945 2599 L
+2945 2599 mt 2996 2488 L
+c15
+-314 -5 -21 -128 2821 1228 3 MP
+PP
+0 sg
+2821 1228 mt 2800 1100 L
+2800 1100 mt 2486 1095 L
+c15
+11 -128 -346 -5 2821 1228 3 MP
+PP
+0 sg
+2821 1228 mt 2475 1223 L
+2475 1223 mt 2486 1095 L
+c17
+-51 -134 304 -4 2692 1285 3 MP
+PP
+0 sg
+2692 1285 mt 2996 1281 L
+2996 1281 mt 2945 1147 L
+c15
+304 -4 -11 -147 2703 1432 3 MP
+PP
+0 sg
+2703 1432 mt 2692 1285 L
+2692 1285 mt 2996 1281 L
+c18
+-15 -119 -228 -4 2742 2559 3 MP
+PP
+0 sg
+2742 2559 mt 2514 2555 L
+2514 2555 mt 2499 2436 L
+c16
+304 -4 13 -111 2679 2603 3 MP
+PP
+0 sg
+2679 2603 mt 2692 2492 L
+2692 2492 mt 2996 2488 L
+/c25 { 0.562500 0.000000 0.000000 sr} bdef
+c25
+-48 -4 -141 -27 2875 796 3 MP
+PP
+0 sg
+2875  796 mt 2734  769 L
+2734  769 mt 2686  765 L
+c25
+-96 -23 -93 -8 2875 796 3 MP
+PP
+0 sg
+2875  796 mt 2782  788 L
+2782  788 mt 2686  765 L
+c25
+-141 -27 -65 -10 2940 806 3 MP
+PP
+0 sg
+2940  806 mt 2875  796 L
+2875  796 mt 2734  769 L
+c25
+-33 -5 -173 -32 2940 806 3 MP
+PP
+0 sg
+2940  806 mt 2767  774 L
+2767  774 mt 2734  769 L
+c25
+-15 -6 -189 -37 2971 817 3 MP
+PP
+0 sg
+2971  817 mt 2782  780 L
+2782  780 mt 2767  774 L
+c25
+-173 -32 -31 -11 2971 817 3 MP
+PP
+0 sg
+2971  817 mt 2940  806 L
+2940  806 mt 2767  774 L
+c25
+-189 -37 7 -12 2964 829 3 MP
+PP
+0 sg
+2964  829 mt 2971  817 L
+2971  817 mt 2782  780 L
+c21
+-165 -8 -83 -71 2955 907 3 MP
+PP
+0 sg
+2955  907 mt 2872  836 L
+2872  836 mt 2707  828 L
+c21
+-35 -69 -213 -10 2955 907 3 MP
+PP
+0 sg
+2955  907 mt 2742  897 L
+2742  897 mt 2707  828 L
+c23
+76 -8 -121 -75 2966 922 3 MP
+PP
+0 sg
+2966  922 mt 2845  847 L
+2845  847 mt 2921  839 L
+c21
+148 -8 -67 -99 2885 1029 3 MP
+PP
+0 sg
+2885 1029 mt 2818  930 L
+2818  930 mt 2966  922 L
+c23
+-121 -75 148 -8 2818 930 3 MP
+PP
+0 sg
+2818  930 mt 2966  922 L
+2966  922 mt 2845  847 L
+c24
+178 -18 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2767 2802 L
+c24
+-33 -5 178 -18 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2767 2802 L
+2767 2802 mt 2734 2797 L
+2734 2797 mt 2589 2820 L
+c24
+-15 -6 193 -12 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2782 2808 L
+2782 2808 mt 2767 2802 L
+2767 2802 mt 2589 2820 L
+c24
+173 -43 -15 -6 2782 2808 3 MP
+PP
+0 sg
+2782 2808 mt 2767 2802 L
+2767 2802 mt 2940 2759 L
+c22
+121 -47 100 -6 2745 2805 3 MP
+PP
+0 sg
+2745 2805 mt 2845 2799 L
+2845 2799 mt 2966 2752 L
+c22
+148 -7 73 -46 2745 2805 3 MP
+PP
+0 sg
+2745 2805 mt 2818 2759 L
+2818 2759 mt 2966 2752 L
+c25
+-185 -44 43 -10 2921 839 3 MP
+PP
+0 sg
+2921  839 mt 2964  829 L
+2964  829 mt 2779  785 L
+c25
+3 -5 -185 -44 2964 829 3 MP
+PP
+0 sg
+2964  829 mt 2779  785 L
+2779  785 mt 2782  780 L
+c17
+13 -111 -314 -5 2800 1100 3 MP
+PP
+0 sg
+2800 1100 mt 2486 1095 L
+2486 1095 mt 2499  984 L
+c17
+-274 -5 -27 -111 2800 1100 3 MP
+PP
+0 sg
+2800 1100 mt 2773  989 L
+2773  989 mt 2499  984 L
+c19
+-60 -118 266 -4 2679 1151 3 MP
+PP
+0 sg
+2679 1151 mt 2945 1147 L
+2945 1147 mt 2885 1029 L
+c20
+-17 -100 -176 -3 2707 2658 3 MP
+PP
+0 sg
+2707 2658 mt 2531 2655 L
+2531 2655 mt 2514 2555 L
+c22
+-176 -3 38 -77 2669 2735 3 MP
+PP
+0 sg
+2669 2735 mt 2707 2658 L
+2707 2658 mt 2531 2655 L
+c22
+38 -77 -113 -6 2782 2741 3 MP
+PP
+0 sg
+2782 2741 mt 2669 2735 L
+2669 2735 mt 2707 2658 L
+c22
+-165 -7 90 -76 2782 2741 3 MP
+PP
+0 sg
+2782 2741 mt 2872 2665 L
+2872 2665 mt 2707 2658 L
+c18
+266 -4 15 -90 2664 2693 3 MP
+PP
+0 sg
+2664 2693 mt 2679 2603 L
+2679 2603 mt 2945 2599 L
+c17
+266 -4 -13 -134 2692 1285 3 MP
+PP
+0 sg
+2692 1285 mt 2679 1151 L
+2679 1151 mt 2945 1147 L
+c18
+60 -91 221 -3 2664 2693 3 MP
+PP
+0 sg
+2664 2693 mt 2885 2690 L
+2885 2690 mt 2945 2599 L
+c24
+168 -2 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2757 2818 L
+c24
+38 -4 130 2 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2719 2822 L
+2719 2822 mt 2757 2818 L
+2757 2818 mt 2589 2820 L
+c24
+22 -5 168 -2 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2757 2818 L
+2757 2818 mt 2779 2813 L
+2779 2813 mt 2589 2820 L
+c24
+190 -7 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2779 2813 L
+c24
+3 -5 190 -7 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2779 2813 L
+2779 2813 mt 2782 2808 L
+2782 2808 mt 2589 2820 L
+c24
+164 -27 38 -4 2719 2822 3 MP
+PP
+0 sg
+2719 2822 mt 2757 2818 L
+2757 2818 mt 2921 2791 L
+c25
+-39 -21 -113 -5 2782 788 3 MP
+PP
+0 sg
+2782  788 mt 2669  783 L
+2669  783 mt 2630  762 L
+c25
+-56 -3 -96 -23 2782 788 3 MP
+PP
+0 sg
+2782  788 mt 2686  765 L
+2686  765 mt 2630  762 L
+c23
+-113 -5 -90 -48 2872 836 3 MP
+PP
+0 sg
+2872  836 mt 2782  788 L
+2782  788 mt 2669  783 L
+c25
+22 -5 -164 -49 2921 839 3 MP
+PP
+0 sg
+2921  839 mt 2757  790 L
+2757  790 mt 2779  785 L
+c24
+76 -8 126 -23 2719 2822 3 MP
+PP
+0 sg
+2719 2822 mt 2845 2799 L
+2845 2799 mt 2921 2791 L
+c23
+-38 -45 -165 -8 2872 836 3 MP
+PP
+0 sg
+2872  836 mt 2707  828 L
+2707  828 mt 2669  783 L
+c25
+-164 -49 76 -8 2845 847 3 MP
+PP
+0 sg
+2845  847 mt 2921  839 L
+2921  839 mt 2757  790 L
+c24
+-119 -1 39 -55 2630 2790 3 MP
+PP
+0 sg
+2630 2790 mt 2669 2735 L
+2669 2735 mt 2550 2734 L
+c22
+-19 -79 -119 -1 2669 2735 3 MP
+PP
+0 sg
+2669 2735 mt 2550 2734 L
+2550 2734 mt 2531 2655 L
+c24
+39 -55 -56 -3 2686 2793 3 MP
+PP
+0 sg
+2686 2793 mt 2630 2790 L
+2630 2790 mt 2669 2735 L
+c24
+-113 -6 96 -52 2686 2793 3 MP
+PP
+0 sg
+2686 2793 mt 2782 2741 L
+2782 2741 mt 2669 2735 L
+c20
+221 -3 17 -69 2647 2762 3 MP
+PP
+0 sg
+2647 2762 mt 2664 2693 L
+2664 2693 mt 2885 2690 L
+c19
+221 -3 -15 -119 2679 1151 3 MP
+PP
+0 sg
+2679 1151 mt 2664 1032 L
+2664 1032 mt 2885 1029 L
+c24
+96 -52 -48 -4 2734 2797 3 MP
+PP
+0 sg
+2734 2797 mt 2686 2793 L
+2686 2793 mt 2782 2741 L
+c20
+67 -69 171 -3 2647 2762 3 MP
+PP
+0 sg
+2647 2762 mt 2818 2759 L
+2818 2759 mt 2885 2690 L
+c19
+15 -90 -274 -5 2773 989 3 MP
+PP
+0 sg
+2773  989 mt 2499  984 L
+2499  984 mt 2514  894 L
+c19
+-228 -3 -31 -92 2773 989 3 MP
+PP
+0 sg
+2773  989 mt 2742  897 L
+2742  897 mt 2514  894 L
+c21
+-67 -99 221 -3 2664 1032 3 MP
+PP
+0 sg
+2664 1032 mt 2885 1029 L
+2885 1029 mt 2818  930 L
+c25
+38 -5 -126 -52 2845 847 3 MP
+PP
+0 sg
+2845  847 mt 2719  795 L
+2719  795 mt 2757  790 L
+c24
+130 2 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2719 2822 L
+c24
+51 -3 79 5 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2668 2825 L
+2668 2825 mt 2719 2822 L
+2719 2822 mt 2589 2820 L
+c24
+126 -23 51 -3 2668 2825 3 MP
+PP
+0 sg
+2668 2825 mt 2719 2822 L
+2719 2822 mt 2845 2799 L
+c25
+-126 -52 100 -5 2745 852 3 MP
+PP
+0 sg
+2745  852 mt 2845  847 L
+2845  847 mt 2719  795 L
+c23
+100 -5 -73 -78 2818 930 3 MP
+PP
+0 sg
+2818  930 mt 2745  852 L
+2745  852 mt 2845  847 L
+c24
+193 -12 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2782 2808 L
+c24
+100 -6 77 -20 2668 2825 3 MP
+PP
+0 sg
+2668 2825 mt 2745 2805 L
+2745 2805 mt 2845 2799 L
+c24
+-56 -3 97 -27 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2686 2793 L
+2686 2793 mt 2630 2790 L
+2630 2790 mt 2589 2820 L
+c24
+97 -27 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2686 2793 L
+c24
+145 -23 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2734 2797 L
+c24
+-48 -4 145 -23 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2734 2797 L
+2734 2797 mt 2686 2793 L
+2686 2793 mt 2589 2820 L
+c22
+73 -46 117 -1 2628 2806 3 MP
+PP
+0 sg
+2628 2806 mt 2745 2805 L
+2745 2805 mt 2818 2759 L
+c21
+171 -2 -17 -100 2664 1032 3 MP
+PP
+0 sg
+2664 1032 mt 2647  932 L
+2647  932 mt 2818  930 L
+c21
+17 -69 -228 -3 2742 897 3 MP
+PP
+0 sg
+2742  897 mt 2514  894 L
+2514  894 mt 2531  825 L
+c21
+-176 -3 -35 -69 2742 897 3 MP
+PP
+0 sg
+2742  897 mt 2707  828 L
+2707  828 mt 2531  825 L
+c23
+-73 -78 171 -2 2647 932 3 MP
+PP
+0 sg
+2647  932 mt 2818  930 L
+2818  930 mt 2745  852 L
+c22
+171 -3 19 -44 2628 2806 3 MP
+PP
+0 sg
+2628 2806 mt 2647 2762 L
+2647 2762 mt 2818 2759 L
+c25
+19 -20 -119 -2 2669 783 3 MP
+PP
+0 sg
+2669  783 mt 2550  781 L
+2550  781 mt 2569  761 L
+c25
+-61 -1 -39 -21 2669 783 3 MP
+PP
+0 sg
+2669  783 mt 2630  762 L
+2630  762 mt 2569  761 L
+/c26 { 0.500000 0.000000 0.000000 sr} bdef
+c26
+0 0 -193 -13 2782 780 3 MP
+PP
+0 sg
+2782  780 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+-193 -13 3 -5 2779 785 3 MP
+PP
+0 sg
+2779  785 mt 2782  780 L
+2782  780 mt 2589  767 L
+2589  767 mt 2779  785 L
+c26
+-178 -7 -15 -6 2782 780 3 MP
+PP
+0 sg
+2782  780 mt 2767  774 L
+2767  774 mt 2589  767 L
+2589  767 mt 2782  780 L
+c26
+0 0 -190 -18 2779 785 3 MP
+PP
+0 sg
+2779  785 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+-190 -18 22 -5 2757 790 3 MP
+PP
+0 sg
+2757  790 mt 2779  785 L
+2779  785 mt 2589  767 L
+2589  767 mt 2757  790 L
+c26
+-145 -2 -33 -5 2767 774 3 MP
+PP
+0 sg
+2767  774 mt 2734  769 L
+2734  769 mt 2589  767 L
+2589  767 mt 2767  774 L
+c26
+0 0 -178 -7 2767 774 3 MP
+PP
+0 sg
+2767  774 mt 2589  767 L
+2589  767 mt 2589  767 L
+c23
+-119 -2 -38 -45 2707 828 3 MP
+PP
+0 sg
+2707  828 mt 2669  783 L
+2669  783 mt 2550  781 L
+c26
+-168 -23 38 -5 2719 795 3 MP
+PP
+0 sg
+2719  795 mt 2757  790 L
+2757  790 mt 2589  767 L
+2589  767 mt 2719  795 L
+c26
+0 0 -168 -23 2757 790 3 MP
+PP
+0 sg
+2757  790 mt 2589  767 L
+2589  767 mt 2589  767 L
+c23
+19 -44 -176 -3 2707 828 3 MP
+PP
+0 sg
+2707  828 mt 2531  825 L
+2531  825 mt 2550  781 L
+c25
+-77 -55 117 -1 2628 853 3 MP
+PP
+0 sg
+2628  853 mt 2745  852 L
+2745  852 mt 2668  797 L
+c23
+117 -1 -19 -79 2647 932 3 MP
+PP
+0 sg
+2647  932 mt 2628  853 L
+2628  853 mt 2745  852 L
+c25
+51 -2 -77 -55 2745 852 3 MP
+PP
+0 sg
+2745  852 mt 2668  797 L
+2668  797 mt 2719  795 L
+c24
+59 -1 20 6 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2609 2826 L
+2609 2826 mt 2668 2825 L
+2668 2825 mt 2589 2820 L
+c24
+79 5 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2668 2825 L
+c24
+117 -1 19 -20 2609 2826 3 MP
+PP
+0 sg
+2609 2826 mt 2628 2806 L
+2628 2806 mt 2745 2805 L
+c24
+77 -20 59 -1 2609 2826 3 MP
+PP
+0 sg
+2609 2826 mt 2668 2825 L
+2668 2825 mt 2745 2805 L
+c26
+0 0 -145 -2 2734 769 3 MP
+PP
+0 sg
+2734  769 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+-97 2 -48 -4 2734 769 3 MP
+PP
+0 sg
+2734  769 mt 2686  765 L
+2686  765 mt 2589  767 L
+2589  767 mt 2734  769 L
+c26
+0 0 -130 -28 2719 795 3 MP
+PP
+0 sg
+2719  795 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+-130 -28 51 -2 2668 797 3 MP
+PP
+0 sg
+2668  797 mt 2719  795 L
+2719  795 mt 2589  767 L
+2589  767 mt 2668  797 L
+c11
+-357 5 -8 -156 2475 2155 3 MP
+PP
+0 sg
+2475 2155 mt 2467 1999 L
+2467 1999 mt 2110 2004 L
+c9
+2 -159 383 6 2332 2064 3 MP
+PP
+0 sg
+2332 2064 mt 2715 2070 L
+2715 2070 mt 2717 1911 L
+c10
+-18 -161 -357 5 2467 1999 3 MP
+PP
+0 sg
+2467 1999 mt 2110 2004 L
+2110 2004 mt 2092 1843 L
+c10
+-371 5 -4 -161 2467 1999 3 MP
+PP
+0 sg
+2467 1999 mt 2463 1838 L
+2463 1838 mt 2092 1843 L
+c9
+388 6 -3 -159 2332 2064 3 MP
+PP
+0 sg
+2332 2064 mt 2329 1905 L
+2329 1905 mt 2717 1911 L
+c8
+-2 -162 388 6 2329 1905 3 MP
+PP
+0 sg
+2329 1905 mt 2717 1911 L
+2717 1911 mt 2715 1749 L
+c11
+-30 -156 -335 5 2475 2155 3 MP
+PP
+0 sg
+2475 2155 mt 2140 2160 L
+2140 2160 mt 2110 2004 L
+c14
+-335 5 -11 -147 2486 2302 3 MP
+PP
+0 sg
+2486 2302 mt 2475 2155 L
+2475 2155 mt 2140 2160 L
+c10
+383 6 -9 -153 2341 2217 3 MP
+PP
+0 sg
+2341 2217 mt 2332 2064 L
+2332 2064 mt 2715 2070 L
+c10
+4 -153 370 6 2341 2217 3 MP
+PP
+0 sg
+2341 2217 mt 2711 2223 L
+2711 2223 mt 2715 2070 L
+c9
+-375 5 -2 -162 2463 1838 3 MP
+PP
+0 sg
+2463 1838 mt 2461 1676 L
+2461 1676 mt 2086 1681 L
+c12
+-4 -161 383 6 2332 1743 3 MP
+PP
+0 sg
+2332 1743 mt 2715 1749 L
+2715 1749 mt 2711 1588 L
+c9
+-6 -162 -371 5 2463 1838 3 MP
+PP
+0 sg
+2463 1838 mt 2092 1843 L
+2092 1843 mt 2086 1681 L
+c8
+383 6 3 -162 2329 1905 3 MP
+PP
+0 sg
+2329 1905 mt 2332 1743 L
+2332 1743 mt 2715 1749 L
+c16
+-304 4 -13 -134 2499 2436 3 MP
+PP
+0 sg
+2499 2436 mt 2486 2302 L
+2486 2302 mt 2182 2306 L
+c11
+8 -141 346 5 2357 2359 3 MP
+PP
+0 sg
+2357 2359 mt 2703 2364 L
+2703 2364 mt 2711 2223 L
+c8
+-371 5 2 -159 2461 1676 3 MP
+PP
+0 sg
+2461 1676 mt 2463 1517 L
+2463 1517 mt 2092 1522 L
+c13
+-8 -156 370 6 2341 1582 3 MP
+PP
+0 sg
+2341 1582 mt 2711 1588 L
+2711 1588 mt 2703 1432 L
+c8
+6 -159 -375 5 2461 1676 3 MP
+PP
+0 sg
+2461 1676 mt 2086 1681 L
+2086 1681 mt 2092 1522 L
+c12
+370 6 9 -161 2332 1743 3 MP
+PP
+0 sg
+2332 1743 mt 2341 1582 L
+2341 1582 mt 2711 1588 L
+c14
+-42 -146 -304 4 2486 2302 3 MP
+PP
+0 sg
+2486 2302 mt 2182 2306 L
+2182 2306 mt 2140 2160 L
+c11
+370 6 -16 -142 2357 2359 3 MP
+PP
+0 sg
+2357 2359 mt 2341 2217 L
+2341 2217 mt 2711 2223 L
+c12
+-357 6 4 -153 2463 1517 3 MP
+PP
+0 sg
+2463 1517 mt 2467 1364 L
+2467 1364 mt 2110 1370 L
+c15
+-11 -147 346 5 2357 1427 3 MP
+PP
+0 sg
+2357 1427 mt 2703 1432 L
+2703 1432 mt 2692 1285 L
+c16
+-51 -134 -266 4 2499 2436 3 MP
+PP
+0 sg
+2499 2436 mt 2233 2440 L
+2233 2440 mt 2182 2306 L
+c18
+-266 4 -15 -119 2514 2555 3 MP
+PP
+0 sg
+2514 2555 mt 2499 2436 L
+2499 2436 mt 2233 2440 L
+c14
+346 5 -21 -128 2378 2487 3 MP
+PP
+0 sg
+2378 2487 mt 2357 2359 L
+2357 2359 mt 2703 2364 L
+c14
+11 -128 314 5 2378 2487 3 MP
+PP
+0 sg
+2378 2487 mt 2692 2492 L
+2692 2492 mt 2703 2364 L
+c12
+18 -152 -371 5 2463 1517 3 MP
+PP
+0 sg
+2463 1517 mt 2092 1522 L
+2092 1522 mt 2110 1370 L
+c13
+346 5 16 -155 2341 1582 3 MP
+PP
+0 sg
+2341 1582 mt 2357 1427 L
+2357 1427 mt 2703 1432 L
+c18
+-60 -118 -221 3 2514 2555 3 MP
+PP
+0 sg
+2514 2555 mt 2293 2558 L
+2293 2558 mt 2233 2440 L
+c20
+-221 3 -17 -100 2531 2655 3 MP
+PP
+0 sg
+2531 2655 mt 2514 2555 L
+2514 2555 mt 2293 2558 L
+c16
+314 5 -27 -111 2405 2598 3 MP
+PP
+0 sg
+2405 2598 mt 2378 2487 L
+2378 2487 mt 2692 2492 L
+c13
+30 -142 -357 6 2467 1364 3 MP
+PP
+0 sg
+2467 1364 mt 2110 1370 L
+2110 1370 mt 2140 1228 L
+c13
+-335 5 8 -141 2467 1364 3 MP
+PP
+0 sg
+2467 1364 mt 2475 1223 L
+2475 1223 mt 2140 1228 L
+c15
+314 5 21 -147 2357 1427 3 MP
+PP
+0 sg
+2357 1427 mt 2378 1280 L
+2378 1280 mt 2692 1285 L
+c17
+-13 -134 314 5 2378 1280 3 MP
+PP
+0 sg
+2378 1280 mt 2692 1285 L
+2692 1285 mt 2679 1151 L
+c16
+13 -111 274 5 2405 2598 3 MP
+PP
+0 sg
+2405 2598 mt 2679 2603 L
+2679 2603 mt 2692 2492 L
+c26
+0 0 -97 2 2686 765 3 MP
+PP
+0 sg
+2686  765 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+-41 5 -56 -3 2686 765 3 MP
+PP
+0 sg
+2686  765 mt 2630  762 L
+2630  762 mt 2589  767 L
+2589  767 mt 2686  765 L
+c22
+-73 -78 -117 1 2550 2734 3 MP
+PP
+0 sg
+2550 2734 mt 2433 2735 L
+2433 2735 mt 2360 2657 L
+c22
+-171 2 -19 -79 2550 2734 3 MP
+PP
+0 sg
+2550 2734 mt 2531 2655 L
+2531 2655 mt 2360 2657 L
+c18
+15 -90 228 3 2436 2690 3 MP
+PP
+0 sg
+2436 2690 mt 2664 2693 L
+2664 2693 mt 2679 2603 L
+c20
+-67 -99 -171 2 2531 2655 3 MP
+PP
+0 sg
+2531 2655 mt 2360 2657 L
+2360 2657 mt 2293 2558 L
+c18
+274 5 -31 -92 2436 2690 3 MP
+PP
+0 sg
+2436 2690 mt 2405 2598 L
+2405 2598 mt 2679 2603 L
+c15
+42 -129 -335 5 2475 1223 3 MP
+PP
+0 sg
+2475 1223 mt 2140 1228 L
+2140 1228 mt 2182 1099 L
+c15
+-304 4 11 -128 2475 1223 3 MP
+PP
+0 sg
+2475 1223 mt 2486 1095 L
+2486 1095 mt 2182 1099 L
+c17
+274 5 27 -134 2378 1280 3 MP
+PP
+0 sg
+2378 1280 mt 2405 1146 L
+2405 1146 mt 2679 1151 L
+c19
+-15 -119 274 5 2405 1146 3 MP
+PP
+0 sg
+2405 1146 mt 2679 1151 L
+2679 1151 mt 2664 1032 L
+c26
+0 0 -79 -30 2668 797 3 MP
+PP
+0 sg
+2668  797 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+-79 -30 59 -1 2609 798 3 MP
+PP
+0 sg
+2609  798 mt 2668  797 L
+2668  797 mt 2589  767 L
+2589  767 mt 2609  798 L
+c25
+59 -1 -19 -55 2628 853 3 MP
+PP
+0 sg
+2628  853 mt 2609  798 L
+2609  798 mt 2668  797 L
+c17
+-266 4 13 -111 2486 1095 3 MP
+PP
+0 sg
+2486 1095 mt 2499  984 L
+2499  984 mt 2233  988 L
+c21
+-17 -100 228 4 2436 1028 3 MP
+PP
+0 sg
+2436 1028 mt 2664 1032 L
+2664 1032 mt 2647  932 L
+c17
+51 -111 -304 4 2486 1095 3 MP
+PP
+0 sg
+2486 1095 mt 2182 1099 L
+2182 1099 mt 2233  988 L
+c19
+228 4 31 -118 2405 1146 3 MP
+PP
+0 sg
+2405 1146 mt 2436 1028 L
+2436 1028 mt 2664 1032 L
+c24
+-77 -55 -59 1 2569 2789 3 MP
+PP
+0 sg
+2569 2789 mt 2510 2790 L
+2510 2790 mt 2433 2735 L
+c24
+-117 1 -19 -55 2569 2789 3 MP
+PP
+0 sg
+2569 2789 mt 2550 2734 L
+2550 2734 mt 2433 2735 L
+c20
+228 3 -35 -69 2471 2759 3 MP
+PP
+0 sg
+2471 2759 mt 2436 2690 L
+2436 2690 mt 2664 2693 L
+c24
+-19 -55 -61 -1 2630 2790 3 MP
+PP
+0 sg
+2630 2790 mt 2569 2789 L
+2569 2789 mt 2550 2734 L
+c20
+17 -69 176 3 2471 2759 3 MP
+PP
+0 sg
+2471 2759 mt 2647 2762 L
+2647 2762 mt 2664 2693 L
+c24
+-100 5 -77 -55 2510 2790 3 MP
+PP
+0 sg
+2510 2790 mt 2433 2735 L
+2433 2735 mt 2333 2740 L
+c24
+-126 -52 -51 2 2510 2790 3 MP
+PP
+0 sg
+2510 2790 mt 2459 2792 L
+2459 2792 mt 2333 2740 L
+c24
+-38 5 -130 -28 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2459 2792 L
+2459 2792 mt 2421 2797 L
+2421 2797 mt 2589 2820 L
+c24
+-51 2 -79 -30 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2510 2790 L
+2510 2790 mt 2459 2792 L
+2459 2792 mt 2589 2820 L
+c24
+-130 -28 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2459 2792 L
+c24
+-59 1 -20 -31 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2569 2789 L
+2569 2789 mt 2510 2790 L
+2510 2790 mt 2589 2820 L
+c24
+-79 -30 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2510 2790 L
+c22
+176 3 -38 -45 2509 2804 3 MP
+PP
+0 sg
+2509 2804 mt 2471 2759 L
+2471 2759 mt 2647 2762 L
+c19
+60 -91 -266 4 2499 984 3 MP
+PP
+0 sg
+2499  984 mt 2233  988 L
+2233  988 mt 2293  897 L
+c19
+-221 3 15 -90 2499 984 3 MP
+PP
+0 sg
+2499  984 mt 2514  894 L
+2514  894 mt 2293  897 L
+c21
+176 3 35 -99 2436 1028 3 MP
+PP
+0 sg
+2436 1028 mt 2471  929 L
+2471  929 mt 2647  932 L
+c24
+-20 -31 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2569 2789 L
+c24
+-61 -1 41 -30 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2630 2790 L
+2630 2790 mt 2569 2789 L
+2569 2789 mt 2589 2820 L
+c24
+41 -30 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2630 2790 L
+c22
+19 -44 119 2 2509 2804 3 MP
+PP
+0 sg
+2509 2804 mt 2628 2806 L
+2628 2806 mt 2647 2762 L
+c23
+-19 -79 176 3 2471 929 3 MP
+PP
+0 sg
+2471  929 mt 2647  932 L
+2647  932 mt 2628  853 L
+c26
+0 0 -41 5 2630 762 3 MP
+PP
+0 sg
+2630  762 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+20 6 -61 -1 2630 762 3 MP
+PP
+0 sg
+2630  762 mt 2569  761 L
+2569  761 mt 2589  767 L
+2589  767 mt 2630  762 L
+c21
+-171 3 17 -69 2514 894 3 MP
+PP
+0 sg
+2514  894 mt 2531  825 L
+2531  825 mt 2360  828 L
+c25
+-19 -55 119 1 2509 852 3 MP
+PP
+0 sg
+2509  852 mt 2628  853 L
+2628  853 mt 2609  798 L
+c24
+-3 5 -190 -18 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2399 2802 L
+2399 2802 mt 2396 2807 L
+2396 2807 mt 2589 2820 L
+c24
+-22 5 -168 -23 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2421 2797 L
+2421 2797 mt 2399 2802 L
+2399 2802 mt 2589 2820 L
+c24
+-190 -18 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2399 2802 L
+c24
+-168 -23 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2421 2797 L
+c24
+56 3 -97 2 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2492 2822 L
+2492 2822 mt 2548 2825 L
+2548 2825 mt 2589 2820 L
+c24
+-41 5 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2548 2825 L
+c24
+-193 -13 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2396 2807 L
+c24
+48 4 -145 -2 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2444 2818 L
+2444 2818 mt 2492 2822 L
+2492 2822 mt 2589 2820 L
+c24
+-97 2 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2492 2822 L
+c24
+33 5 -178 -7 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2411 2813 L
+2411 2813 mt 2444 2818 L
+2444 2818 mt 2589 2820 L
+c24
+-145 -2 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2444 2818 L
+c24
+15 6 -193 -13 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2396 2807 L
+2396 2807 mt 2411 2813 L
+2411 2813 mt 2589 2820 L
+c24
+-178 -7 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2411 2813 L
+c24
+61 1 -41 5 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2548 2825 L
+2548 2825 mt 2609 2826 L
+2609 2826 mt 2589 2820 L
+c24
+20 6 0 0 2589 2820 3 MP
+PP
+0 sg
+2589 2820 mt 2589 2820 L
+2589 2820 mt 2609 2826 L
+c24
+19 -20 61 1 2548 2825 3 MP
+PP
+0 sg
+2548 2825 mt 2609 2826 L
+2609 2826 mt 2628 2806 L
+c24
+119 2 -39 -21 2548 2825 3 MP
+PP
+0 sg
+2548 2825 mt 2509 2804 L
+2509 2804 mt 2628 2806 L
+c21
+67 -69 -221 3 2514 894 3 MP
+PP
+0 sg
+2514  894 mt 2293  897 L
+2293  897 mt 2360  828 L
+c23
+119 1 38 -77 2471 929 3 MP
+PP
+0 sg
+2471  929 mt 2509  852 L
+2509  852 mt 2628  853 L
+c26
+-20 -31 61 1 2548 797 3 MP
+PP
+0 sg
+2548  797 mt 2609  798 L
+2609  798 mt 2589  767 L
+2589  767 mt 2548  797 L
+c26
+0 0 -20 -31 2609 798 3 MP
+PP
+0 sg
+2609  798 mt 2589  767 L
+2589  767 mt 2589  767 L
+c23
+73 -46 -171 3 2531 825 3 MP
+PP
+0 sg
+2531  825 mt 2360  828 L
+2360  828 mt 2433  782 L
+c23
+-117 1 19 -44 2531 825 3 MP
+PP
+0 sg
+2531  825 mt 2550  781 L
+2550  781 mt 2433  782 L
+c25
+61 1 39 -55 2509 852 3 MP
+PP
+0 sg
+2509  852 mt 2548  797 L
+2548  797 mt 2609  798 L
+c25
+-38 4 126 -23 2333 788 3 MP
+PP
+0 sg
+2333  788 mt 2459  765 L
+2459  765 mt 2421  769 L
+c25
+126 -23 -100 6 2433 782 3 MP
+PP
+0 sg
+2433  782 mt 2333  788 L
+2333  788 mt 2459  765 L
+c25
+-51 3 77 -20 2433 782 3 MP
+PP
+0 sg
+2433  782 mt 2510  762 L
+2510  762 mt 2459  765 L
+c25
+77 -20 -117 1 2550 781 3 MP
+PP
+0 sg
+2550  781 mt 2433  782 L
+2433  782 mt 2510  762 L
+c25
+-59 1 19 -20 2550 781 3 MP
+PP
+0 sg
+2550  781 mt 2569  761 L
+2569  761 mt 2510  762 L
+c26
+193 -12 -3 5 2399 774 3 MP
+PP
+0 sg
+2399  774 mt 2396  779 L
+2396  779 mt 2589  767 L
+2589  767 mt 2399  774 L
+c26
+0 0 190 -7 2399 774 3 MP
+PP
+0 sg
+2399  774 mt 2589  767 L
+2589  767 mt 2589  767 L
+c23
+-100 6 73 -46 2360 828 3 MP
+PP
+0 sg
+2360  828 mt 2433  782 L
+2433  782 mt 2333  788 L
+c26
+178 -18 15 6 2396 779 3 MP
+PP
+0 sg
+2396  779 mt 2411  785 L
+2411  785 mt 2589  767 L
+2589  767 mt 2396  779 L
+c26
+0 0 193 -12 2396 779 3 MP
+PP
+0 sg
+2396  779 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+0 0 178 -18 2411 785 3 MP
+PP
+0 sg
+2411  785 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+97 -27 48 4 2444 790 3 MP
+PP
+0 sg
+2444  790 mt 2492  794 L
+2492  794 mt 2589  767 L
+2589  767 mt 2444  790 L
+c26
+0 0 145 -23 2444 790 3 MP
+PP
+0 sg
+2444  790 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+41 -30 56 3 2492 794 3 MP
+PP
+0 sg
+2492  794 mt 2548  797 L
+2548  797 mt 2589  767 L
+2589  767 mt 2492  794 L
+c26
+0 0 97 -27 2492 794 3 MP
+PP
+0 sg
+2492  794 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+0 0 41 -30 2548 797 3 MP
+PP
+0 sg
+2548  797 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+79 5 -59 1 2569 761 3 MP
+PP
+0 sg
+2569  761 mt 2510  762 L
+2510  762 mt 2589  767 L
+2589  767 mt 2569  761 L
+c26
+0 0 20 6 2569 761 3 MP
+PP
+0 sg
+2569  761 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+130 2 -51 3 2510 762 3 MP
+PP
+0 sg
+2510  762 mt 2459  765 L
+2459  765 mt 2589  767 L
+2589  767 mt 2510  762 L
+c26
+0 0 79 5 2510 762 3 MP
+PP
+0 sg
+2510  762 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+168 -2 -38 4 2459 765 3 MP
+PP
+0 sg
+2459  765 mt 2421  769 L
+2421  769 mt 2589  767 L
+2589  767 mt 2459  765 L
+c26
+0 0 130 2 2459 765 3 MP
+PP
+0 sg
+2459  765 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+190 -7 -22 5 2421 769 3 MP
+PP
+0 sg
+2421  769 mt 2399  774 L
+2399  774 mt 2589  767 L
+2589  767 mt 2421  769 L
+c26
+0 0 168 -2 2421 769 3 MP
+PP
+0 sg
+2421  769 mt 2589  767 L
+2589  767 mt 2589  767 L
+c26
+145 -23 33 5 2411 785 3 MP
+PP
+0 sg
+2411  785 mt 2444  790 L
+2444  790 mt 2589  767 L
+2589  767 mt 2411  785 L
+c25
+39 -55 113 6 2396 846 3 MP
+PP
+0 sg
+2396  846 mt 2509  852 L
+2509  852 mt 2548  797 L
+c25
+56 3 96 -52 2396 846 3 MP
+PP
+0 sg
+2396  846 mt 2492  794 L
+2492  794 mt 2548  797 L
+c24
+-39 -21 56 3 2492 2822 3 MP
+PP
+0 sg
+2492 2822 mt 2548 2825 L
+2548 2825 mt 2509 2804 L
+gr
+
+24 W
+1 sg
+2537 1175 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2536 1368 PD
+gs 655 283 3870 3023 rc
+c24
+-185 -44 -22 5 2421 2797 3 MP
+PP
+0 sg
+2421 2797 mt 2399 2802 L
+2399 2802 mt 2214 2758 L
+c24
+-43 10 -164 -49 2421 2797 3 MP
+PP
+0 sg
+2421 2797 mt 2257 2748 L
+2257 2748 mt 2214 2758 L
+c24
+-76 8 -126 -52 2459 2792 3 MP
+PP
+0 sg
+2459 2792 mt 2333 2740 L
+2333 2740 mt 2257 2748 L
+c24
+-164 -49 -38 5 2459 2792 3 MP
+PP
+0 sg
+2459 2792 mt 2421 2797 L
+2421 2797 mt 2257 2748 L
+c22
+-38 -45 113 5 2396 2799 3 MP
+PP
+0 sg
+2396 2799 mt 2509 2804 L
+2509 2804 mt 2471 2759 L
+c23
+38 -77 165 7 2306 922 3 MP
+PP
+0 sg
+2306  922 mt 2471  929 L
+2471  929 mt 2509  852 L
+c23
+113 6 90 -76 2306 922 3 MP
+PP
+0 sg
+2306  922 mt 2396  846 L
+2396  846 mt 2509  852 L
+c24
+113 5 -96 -23 2492 2822 3 MP
+PP
+0 sg
+2492 2822 mt 2396 2799 L
+2396 2799 mt 2509 2804 L
+gr
+
+0 sg
+24 W
+1 sg
+2499 1242 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2494 1130 PD
+gs 655 283 3870 3023 rc
+c21
+-148 7 67 -69 2293 897 3 MP
+PP
+0 sg
+2293  897 mt 2360  828 L
+2360  828 mt 2212  835 L
+c23
+121 -47 -148 7 2360 828 3 MP
+PP
+0 sg
+2360  828 mt 2212  835 L
+2212  835 mt 2333  788 L
+c25
+96 -52 93 8 2303 838 3 MP
+PP
+0 sg
+2303  838 mt 2396  846 L
+2396  846 mt 2492  794 L
+c25
+48 4 141 -48 2303 838 3 MP
+PP
+0 sg
+2303  838 mt 2444  790 L
+2444  790 mt 2492  794 L
+c24
+-96 -23 48 4 2444 2818 3 MP
+PP
+0 sg
+2444 2818 mt 2492 2822 L
+2492 2822 mt 2396 2799 L
+gr
+
+0 sg
+24 W
+1 sg
+2486 1310 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2473 1335 PD
+gs 655 283 3870 3023 rc
+c21
+35 -99 213 10 2223 1018 3 MP
+PP
+0 sg
+2223 1018 mt 2436 1028 L
+2436 1028 mt 2471  929 L
+c22
+165 8 -90 -48 2396 2799 3 MP
+PP
+0 sg
+2396 2799 mt 2306 2751 L
+2306 2751 mt 2471 2759 L
+c22
+-111 11 -121 -75 2333 2740 3 MP
+PP
+0 sg
+2333 2740 mt 2212 2665 L
+2212 2665 mt 2101 2676 L
+c22
+-156 -72 -76 8 2333 2740 3 MP
+PP
+0 sg
+2333 2740 mt 2257 2748 L
+2257 2748 mt 2101 2676 L
+c22
+-148 8 -73 -78 2433 2735 3 MP
+PP
+0 sg
+2433 2735 mt 2360 2657 L
+2360 2657 mt 2212 2665 L
+c22
+-121 -75 -100 5 2433 2735 3 MP
+PP
+0 sg
+2433 2735 mt 2333 2740 L
+2333 2740 mt 2212 2665 L
+c20
+-35 -69 165 8 2306 2751 3 MP
+PP
+0 sg
+2306 2751 mt 2471 2759 L
+2471 2759 mt 2436 2690 L
+c21
+165 7 83 -96 2223 1018 3 MP
+PP
+0 sg
+2223 1018 mt 2306  922 L
+2306  922 mt 2471  929 L
+gr
+
+0 sg
+24 W
+1 sg
+2469 1460 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2468 1452 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2455 1166 PD
+gs 655 283 3870 3023 rc
+c25
+141 -48 65 10 2238 828 3 MP
+PP
+0 sg
+2238  828 mt 2303  838 L
+2303  838 mt 2444  790 L
+c25
+33 5 173 -43 2238 828 3 MP
+PP
+0 sg
+2238  828 mt 2411  785 L
+2411  785 mt 2444  790 L
+c24
+31 11 -189 -37 2396 2807 3 MP
+PP
+0 sg
+2396 2807 mt 2207 2770 L
+2207 2770 mt 2238 2781 L
+c24
+-173 -32 15 6 2396 2807 3 MP
+PP
+0 sg
+2396 2807 mt 2411 2813 L
+2411 2813 mt 2238 2781 L
+c24
+-141 -27 33 5 2411 2813 3 MP
+PP
+0 sg
+2411 2813 mt 2444 2818 L
+2444 2818 mt 2303 2791 L
+c24
+-189 -37 -3 5 2399 2802 3 MP
+PP
+0 sg
+2399 2802 mt 2396 2807 L
+2396 2807 mt 2207 2770 L
+c24
+-7 12 -185 -44 2399 2802 3 MP
+PP
+0 sg
+2399 2802 mt 2214 2758 L
+2214 2758 mt 2207 2770 L
+c24
+93 8 -141 -27 2444 2818 3 MP
+PP
+0 sg
+2444 2818 mt 2303 2791 L
+2303 2791 mt 2396 2799 L
+c20
+213 10 -83 -71 2306 2751 3 MP
+PP
+0 sg
+2306 2751 mt 2223 2680 L
+2223 2680 mt 2436 2690 L
+c20
+-192 10 -67 -99 2360 2657 3 MP
+PP
+0 sg
+2360 2657 mt 2293 2558 L
+2293 2558 mt 2101 2568 L
+c20
+-111 -97 -148 8 2360 2657 3 MP
+PP
+0 sg
+2360 2657 mt 2212 2665 L
+2212 2665 mt 2101 2568 L
+c18
+-31 -92 213 10 2223 2680 3 MP
+PP
+0 sg
+2223 2680 mt 2436 2690 L
+2436 2690 mt 2405 2598 L
+c15
+-264 14 42 -129 2140 1228 3 MP
+PP
+0 sg
+2140 1228 mt 2182 1099 L
+2182 1099 mt 1918 1113 L
+c19
+31 -118 257 12 2148 1134 3 MP
+PP
+0 sg
+2148 1134 mt 2405 1146 L
+2405 1146 mt 2436 1028 L
+c17
+84 -113 -264 14 2182 1099 3 MP
+PP
+0 sg
+2182 1099 mt 1918 1113 L
+1918 1113 mt 2002 1000 L
+c17
+-231 12 51 -111 2182 1099 3 MP
+PP
+0 sg
+2182 1099 mt 2233  988 L
+2233  988 mt 2002 1000 L
+c19
+213 10 75 -116 2148 1134 3 MP
+PP
+0 sg
+2148 1134 mt 2223 1018 L
+2223 1018 mt 2436 1028 L
+gr
+
+0 sg
+24 W
+1 sg
+2433 1138 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2423 1068 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2422 1192 PD
+gs 655 283 3870 3023 rc
+c25
+164 -27 -76 8 2333 788 3 MP
+PP
+0 sg
+2333  788 mt 2257  796 L
+2257  796 mt 2421  769 L
+c25
+-22 5 164 -27 2257 796 3 MP
+PP
+0 sg
+2257  796 mt 2421  769 L
+2421  769 mt 2399  774 L
+gr
+
+0 sg
+24 W
+1 sg
+2417 1377 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2416 1137 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2412 1295 PD
+gs 655 283 3870 3023 rc
+c23
+156 -51 -111 12 2212 835 3 MP
+PP
+0 sg
+2212  835 mt 2101  847 L
+2101  847 mt 2257  796 L
+c23
+-76 8 121 -47 2212 835 3 MP
+PP
+0 sg
+2212  835 mt 2333  788 L
+2333  788 mt 2257  796 L
+c25
+173 -43 31 11 2207 817 3 MP
+PP
+0 sg
+2207  817 mt 2238  828 L
+2238  828 mt 2411  785 L
+c25
+15 6 189 -38 2207 817 3 MP
+PP
+0 sg
+2207  817 mt 2396  779 L
+2396  779 mt 2411  785 L
+c24
+65 10 -173 -32 2411 2813 3 MP
+PP
+0 sg
+2411 2813 mt 2238 2781 L
+2238 2781 mt 2303 2791 L
+c18
+-99 -116 -192 10 2293 2558 3 MP
+PP
+0 sg
+2293 2558 mt 2101 2568 L
+2101 2568 mt 2002 2452 L
+c18
+-231 12 -60 -118 2293 2558 3 MP
+PP
+0 sg
+2293 2558 mt 2233 2440 L
+2233 2440 mt 2002 2452 L
+c16
+-27 -111 257 12 2148 2586 3 MP
+PP
+0 sg
+2148 2586 mt 2405 2598 L
+2405 2598 mt 2378 2487 L
+c20
+-144 -93 -111 11 2212 2665 3 MP
+PP
+0 sg
+2212 2665 mt 2101 2676 L
+2101 2676 mt 1957 2583 L
+c20
+-144 15 -111 -97 2212 2665 3 MP
+PP
+0 sg
+2212 2665 mt 2101 2568 L
+2101 2568 mt 1957 2583 L
+c18
+257 12 -75 -94 2223 2680 3 MP
+PP
+0 sg
+2223 2680 mt 2148 2586 L
+2148 2586 mt 2405 2598 L
+c13
+-290 14 30 -142 2110 1370 3 MP
+PP
+0 sg
+2110 1370 mt 2140 1228 L
+2140 1228 mt 1850 1242 L
+c15
+68 -129 -290 14 2140 1228 3 MP
+PP
+0 sg
+2140 1228 mt 1850 1242 L
+1850 1242 mt 1918 1113 L
+c17
+257 12 63 -133 2085 1267 3 MP
+PP
+0 sg
+2085 1267 mt 2148 1134 L
+2148 1134 mt 2405 1146 L
+c17
+27 -134 293 13 2085 1267 3 MP
+PP
+0 sg
+2085 1267 mt 2378 1280 L
+2378 1280 mt 2405 1146 L
+gr
+
+0 sg
+24 W
+1 sg
+2402 1483 PD
+gs 655 283 3870 3023 rc
+c23
+-43 10 156 -51 2101 847 3 MP
+PP
+0 sg
+2101  847 mt 2257  796 L
+2257  796 mt 2214  806 L
+c25
+-3 5 185 -32 2214 806 3 MP
+PP
+0 sg
+2214  806 mt 2399  774 L
+2399  774 mt 2396  779 L
+c25
+185 -32 -43 10 2257 796 3 MP
+PP
+0 sg
+2257  796 mt 2214  806 L
+2214  806 mt 2399  774 L
+c21
+111 -72 -192 10 2293 897 3 MP
+PP
+0 sg
+2293  897 mt 2101  907 L
+2101  907 mt 2212  835 L
+c19
+-192 10 60 -91 2233 988 3 MP
+PP
+0 sg
+2233  988 mt 2293  897 L
+2293  897 mt 2101  907 L
+c23
+93 8 134 -72 2169 910 3 MP
+PP
+0 sg
+2169  910 mt 2303  838 L
+2303  838 mt 2396  846 L
+c23
+90 -76 137 12 2169 910 3 MP
+PP
+0 sg
+2169  910 mt 2306  922 L
+2306  922 mt 2396  846 L
+c22
+-90 -48 93 8 2303 2791 3 MP
+PP
+0 sg
+2303 2791 mt 2396 2799 L
+2396 2799 mt 2306 2751 L
+c25
+189 -38 -7 11 2214 806 3 MP
+PP
+0 sg
+2214  806 mt 2207  817 L
+2207  817 mt 2396  779 L
+gr
+
+0 sg
+24 W
+1 sg
+2395 1533 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2380 1458 PD
+gs 655 283 3870 3023 rc
+c12
+-310 15 18 -152 2092 1522 3 MP
+PP
+0 sg
+2092 1522 mt 2110 1370 L
+2110 1370 mt 1800 1385 L
+c13
+50 -143 -310 15 2110 1370 3 MP
+PP
+0 sg
+2110 1370 mt 1800 1385 L
+1800 1385 mt 1850 1242 L
+c15
+293 13 51 -145 2034 1412 3 MP
+PP
+0 sg
+2034 1412 mt 2085 1267 L
+2085 1267 mt 2378 1280 L
+c15
+21 -147 323 15 2034 1412 3 MP
+PP
+0 sg
+2034 1412 mt 2357 1427 L
+2357 1427 mt 2378 1280 L
+c16
+293 14 -63 -113 2148 2586 3 MP
+PP
+0 sg
+2148 2586 mt 2085 2473 L
+2085 2473 mt 2378 2487 L
+c16
+-84 -133 -231 12 2233 2440 3 MP
+PP
+0 sg
+2233 2440 mt 2002 2452 L
+2002 2452 mt 1918 2319 L
+c16
+-264 13 -51 -134 2233 2440 3 MP
+PP
+0 sg
+2233 2440 mt 2182 2306 L
+2182 2306 mt 1918 2319 L
+c14
+-21 -128 293 14 2085 2473 3 MP
+PP
+0 sg
+2085 2473 mt 2378 2487 L
+2378 2487 mt 2357 2359 L
+gr
+
+0 sg
+24 W
+1 sg
+2377 1363 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2371 1171 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2363 1468 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2362 1090 PD
+gs 655 283 3870 3023 rc
+c14
+323 15 -51 -129 2085 2473 3 MP
+PP
+0 sg
+2085 2473 mt 2034 2344 L
+2034 2344 mt 2357 2359 L
+c14
+-290 14 -42 -146 2182 2306 3 MP
+PP
+0 sg
+2182 2306 mt 2140 2160 L
+2140 2160 mt 1850 2174 L
+c14
+-68 -145 -264 13 2182 2306 3 MP
+PP
+0 sg
+2182 2306 mt 1918 2319 L
+1918 2319 mt 1850 2174 L
+c11
+-16 -142 323 15 2034 2344 3 MP
+PP
+0 sg
+2034 2344 mt 2357 2359 L
+2357 2359 mt 2341 2217 L
+c8
+-323 16 6 -159 2086 1681 3 MP
+PP
+0 sg
+2086 1681 mt 2092 1522 L
+2092 1522 mt 1769 1538 L
+c13
+16 -155 345 16 1996 1566 3 MP
+PP
+0 sg
+1996 1566 mt 2341 1582 L
+2341 1582 mt 2357 1427 L
+c12
+31 -153 -323 16 2092 1522 3 MP
+PP
+0 sg
+2092 1522 mt 1769 1538 L
+1769 1538 mt 1800 1385 L
+c13
+323 15 38 -154 1996 1566 3 MP
+PP
+0 sg
+1996 1566 mt 2034 1412 L
+2034 1412 mt 2357 1427 L
+gr
+
+0 sg
+24 W
+1 sg
+2352 1286 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2349 1525 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2343 1285 PD
+gs 655 283 3870 3023 rc
+c8
+10 -160 -327 17 2086 1681 3 MP
+PP
+0 sg
+2086 1681 mt 1759 1698 L
+1759 1698 mt 1769 1538 L
+c9
+-327 17 -6 -162 2092 1843 3 MP
+PP
+0 sg
+2092 1843 mt 2086 1681 L
+2086 1681 mt 1759 1698 L
+c12
+345 16 22 -160 1974 1726 3 MP
+PP
+0 sg
+1974 1726 mt 1996 1566 L
+1996 1566 mt 2341 1582 L
+c11
+345 16 -38 -143 2034 2344 3 MP
+PP
+0 sg
+2034 2344 mt 1996 2201 L
+1996 2201 mt 2341 2217 L
+c12
+9 -161 358 17 1974 1726 3 MP
+PP
+0 sg
+1974 1726 mt 2332 1743 L
+2332 1743 mt 2341 1582 L
+c11
+-310 16 -30 -156 2140 2160 3 MP
+PP
+0 sg
+2140 2160 mt 2110 2004 L
+2110 2004 mt 1800 2020 L
+c11
+-50 -154 -290 14 2140 2160 3 MP
+PP
+0 sg
+2140 2160 mt 1850 2174 L
+1850 2174 mt 1800 2020 L
+c10
+-9 -153 345 16 1996 2201 3 MP
+PP
+0 sg
+1996 2201 mt 2341 2217 L
+2341 2217 mt 2332 2064 L
+gr
+
+0 sg
+24 W
+1 sg
+2336 1394 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2334 1123 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2334 1344 PD
+gs 655 283 3870 3023 rc
+c10
+-323 17 -18 -161 2110 2004 3 MP
+PP
+0 sg
+2110 2004 mt 2092 1843 L
+2092 1843 mt 1769 1860 L
+c10
+-31 -160 -310 16 2110 2004 3 MP
+PP
+0 sg
+2110 2004 mt 1800 2020 L
+1800 2020 mt 1769 1860 L
+c9
+-3 -159 358 17 1974 2047 3 MP
+PP
+0 sg
+1974 2047 mt 2332 2064 L
+2332 2064 mt 2329 1905 L
+c10
+358 17 -22 -154 1996 2201 3 MP
+PP
+0 sg
+1996 2201 mt 1974 2047 L
+1974 2047 mt 2332 2064 L
+c9
+-10 -162 -323 17 2092 1843 3 MP
+PP
+0 sg
+2092 1843 mt 1769 1860 L
+1769 1860 mt 1759 1698 L
+c8
+3 -162 363 17 1966 1888 3 MP
+PP
+0 sg
+1966 1888 mt 2329 1905 L
+2329 1905 mt 2332 1743 L
+c8
+358 17 8 -162 1966 1888 3 MP
+PP
+0 sg
+1966 1888 mt 1974 1726 L
+1974 1726 mt 2332 1743 L
+c9
+363 17 -8 -159 1974 2047 3 MP
+PP
+0 sg
+1974 2047 mt 1966 1888 L
+1966 1888 mt 2329 1905 L
+gr
+
+0 sg
+24 W
+1 sg
+2319 1083 PD
+gs 655 283 3870 3023 rc
+c19
+99 -93 -231 12 2233 988 3 MP
+PP
+0 sg
+2233  988 mt 2002 1000 L
+2002 1000 mt 2101  907 L
+c21
+83 -96 178 15 2045 1003 3 MP
+PP
+0 sg
+2045 1003 mt 2223 1018 L
+2223 1018 mt 2306  922 L
+c21
+137 12 124 -93 2045 1003 3 MP
+PP
+0 sg
+2045 1003 mt 2169  910 L
+2169  910 mt 2306  922 L
+c22
+-64 15 -156 -72 2257 2748 3 MP
+PP
+0 sg
+2257 2748 mt 2101 2676 L
+2101 2676 mt 2037 2691 L
+c22
+-177 -67 -43 10 2257 2748 3 MP
+PP
+0 sg
+2257 2748 mt 2214 2758 L
+2214 2758 mt 2037 2691 L
+c22
+137 12 -134 -52 2303 2791 3 MP
+PP
+0 sg
+2303 2791 mt 2169 2739 L
+2169 2739 mt 2306 2751 L
+c20
+-83 -71 137 12 2169 2739 3 MP
+PP
+0 sg
+2169 2739 mt 2306 2751 L
+2306 2751 mt 2223 2680 L
+c21
+144 -75 -144 15 2101 907 3 MP
+PP
+0 sg
+2101  907 mt 1957  922 L
+1957  922 mt 2101  847 L
+c21
+-111 12 111 -72 2101 907 3 MP
+PP
+0 sg
+2101  907 mt 2212  835 L
+2212  835 mt 2101  847 L
+c23
+134 -72 96 15 2073 895 3 MP
+PP
+0 sg
+2073  895 mt 2169  910 L
+2169  910 mt 2303  838 L
+c22
+-9 17 -177 -67 2214 2758 3 MP
+PP
+0 sg
+2214 2758 mt 2037 2691 L
+2037 2691 mt 2028 2708 L
+c22
+-179 -62 -7 12 2214 2758 3 MP
+PP
+0 sg
+2214 2758 mt 2207 2770 L
+2207 2770 mt 2028 2708 L
+c22
+-134 -52 65 10 2238 2781 3 MP
+PP
+0 sg
+2238 2781 mt 2303 2791 L
+2303 2791 mt 2169 2739 L
+c23
+65 10 165 -67 2073 895 3 MP
+PP
+0 sg
+2073  895 mt 2238  828 L
+2238  828 mt 2303  838 L
+gr
+
+0 sg
+24 W
+1 sg
+2296 1466 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2296 1226 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2283 1362 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2282 1224 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2278 1568 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2277 1304 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2277 1508 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2276 1112 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2275 1509 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2275 1469 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2266 1343 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2255 1272 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2254 1571 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2246 1094 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2240 1103 PD
+gs 655 283 3870 3023 rc
+c21
+-64 15 144 -75 1957 922 3 MP
+PP
+0 sg
+1957  922 mt 2101  847 L
+2101  847 mt 2037  862 L
+c23
+165 -67 45 17 2028 878 3 MP
+PP
+0 sg
+2028  878 mt 2073  895 L
+2073  895 mt 2238  828 L
+c22
+45 16 -179 -62 2207 2770 3 MP
+PP
+0 sg
+2207 2770 mt 2028 2708 L
+2028 2708 mt 2073 2724 L
+c22
+-165 -57 31 11 2207 2770 3 MP
+PP
+0 sg
+2207 2770 mt 2238 2781 L
+2238 2781 mt 2073 2724 L
+c22
+96 15 -165 -57 2238 2781 3 MP
+PP
+0 sg
+2238 2781 mt 2073 2724 L
+2073 2724 mt 2169 2739 L
+c23
+31 11 179 -61 2028 878 3 MP
+PP
+0 sg
+2028  878 mt 2207  817 L
+2207  817 mt 2238  828 L
+gr
+
+0 sg
+24 W
+1 sg
+2236 1229 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2231 1383 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2230 1121 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2229 1442 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2228 1318 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2223 1194 PD
+gs 655 283 3870 3023 rc
+c20
+-82 19 -144 -93 2101 2676 3 MP
+PP
+0 sg
+2101 2676 mt 1957 2583 L
+1957 2583 mt 1875 2602 L
+c20
+-162 -89 -64 15 2101 2676 3 MP
+PP
+0 sg
+2101 2676 mt 2037 2691 L
+2037 2691 mt 1875 2602 L
+c18
+-75 -94 178 16 2045 2664 3 MP
+PP
+0 sg
+2045 2664 mt 2223 2680 L
+2223 2680 mt 2148 2586 L
+c19
+178 15 110 -113 1935 1116 3 MP
+PP
+0 sg
+1935 1116 mt 2045 1003 L
+2045 1003 mt 2223 1018 L
+c19
+75 -116 213 18 1935 1116 3 MP
+PP
+0 sg
+1935 1116 mt 2148 1134 L
+2148 1134 mt 2223 1018 L
+c20
+178 16 -124 -75 2169 2739 3 MP
+PP
+0 sg
+2169 2739 mt 2045 2664 L
+2045 2664 mt 2223 2680 L
+c23
+177 -56 -64 15 2101 847 3 MP
+PP
+0 sg
+2101  847 mt 2037  862 L
+2037  862 mt 2214  806 L
+c23
+-7 11 177 -56 2037 862 3 MP
+PP
+0 sg
+2037  862 mt 2214  806 L
+2214  806 mt 2207  817 L
+gr
+
+0 sg
+24 W
+1 sg
+2208 1555 PD
+gs 655 283 3870 3023 rc
+c23
+179 -61 -9 16 2037 862 3 MP
+PP
+0 sg
+2037  862 mt 2028  878 L
+2028  878 mt 2207  817 L
+gr
+
+0 sg
+24 W
+1 sg
+2198 1227 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2198 1472 PD
+gs 655 283 3870 3023 rc
+c19
+128 -96 -173 18 2002 1000 3 MP
+PP
+0 sg
+2002 1000 mt 1829 1018 L
+1829 1018 mt 1957  922 L
+c19
+-144 15 99 -93 2002 1000 3 MP
+PP
+0 sg
+2002 1000 mt 2101  907 L
+2101  907 mt 1957  922 L
+c21
+124 -93 124 19 1921 984 3 MP
+PP
+0 sg
+1921  984 mt 2045 1003 L
+2045 1003 mt 2169  910 L
+c21
+96 15 152 -89 1921 984 3 MP
+PP
+0 sg
+1921  984 mt 2073  895 L
+2073  895 mt 2169  910 L
+c20
+-124 -75 96 15 2073 2724 3 MP
+PP
+0 sg
+2073 2724 mt 2169 2739 L
+2169 2739 mt 2045 2664 L
+gr
+
+0 sg
+24 W
+1 sg
+2156 1272 PD
+gs 655 283 3870 3023 rc
+c13
+-219 23 50 -143 1800 1385 3 MP
+PP
+0 sg
+1800 1385 mt 1850 1242 L
+1850 1242 mt 1631 1265 L
+c15
+88 -132 -219 23 1850 1242 3 MP
+PP
+0 sg
+1850 1242 mt 1631 1265 L
+1631 1265 mt 1719 1133 L
+c15
+-199 20 68 -129 1850 1242 3 MP
+PP
+0 sg
+1850 1242 mt 1918 1113 L
+1918 1113 mt 1719 1133 L
+c17
+213 18 94 -129 1841 1245 3 MP
+PP
+0 sg
+1841 1245 mt 1935 1116 L
+1935 1116 mt 2148 1134 L
+c17
+63 -133 244 22 1841 1245 3 MP
+PP
+0 sg
+1841 1245 mt 2085 1267 L
+2085 1267 mt 2148 1134 L
+c18
+-99 23 -128 -113 1957 2583 3 MP
+PP
+0 sg
+1957 2583 mt 1829 2470 L
+1829 2470 mt 1730 2493 L
+c18
+-128 -113 -144 15 2101 2568 3 MP
+PP
+0 sg
+2101 2568 mt 1957 2583 L
+1957 2583 mt 1829 2470 L
+c18
+-173 18 -99 -116 2101 2568 3 MP
+PP
+0 sg
+2101 2568 mt 2002 2452 L
+2002 2452 mt 1829 2470 L
+c16
+-63 -113 213 18 1935 2568 3 MP
+PP
+0 sg
+1935 2568 mt 2148 2586 L
+2148 2586 mt 2085 2473 L
+c18
+-145 -109 -82 19 1957 2583 3 MP
+PP
+0 sg
+1957 2583 mt 1875 2602 L
+1875 2602 mt 1730 2493 L
+c18
+213 18 -110 -96 2045 2664 3 MP
+PP
+0 sg
+2045 2664 mt 1935 2568 L
+1935 2568 mt 2148 2586 L
+gr
+
+0 sg
+24 W
+1 sg
+2147 1174 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2145 1460 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2144 1415 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2139 1245 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2133 1357 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2119 1506 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2104 1104 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2088 1296 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2085 1566 PD
+gs 655 283 3870 3023 rc
+c13
+64 -145 -233 25 1800 1385 3 MP
+PP
+0 sg
+1800 1385 mt 1567 1410 L
+1567 1410 mt 1631 1265 L
+c15
+244 22 76 -143 1765 1388 3 MP
+PP
+0 sg
+1765 1388 mt 1841 1245 L
+1841 1245 mt 2085 1267 L
+c16
+-110 -130 -173 18 2002 2452 3 MP
+PP
+0 sg
+2002 2452 mt 1829 2470 L
+1829 2470 mt 1719 2340 L
+c16
+244 21 -94 -116 1935 2568 3 MP
+PP
+0 sg
+1935 2568 mt 1841 2452 L
+1841 2452 mt 2085 2473 L
+c12
+-233 25 31 -153 1769 1538 3 MP
+PP
+0 sg
+1769 1538 mt 1800 1385 L
+1800 1385 mt 1567 1410 L
+c15
+51 -145 269 24 1765 1388 3 MP
+PP
+0 sg
+1765 1388 mt 2034 1412 L
+2034 1412 mt 2085 1267 L
+c16
+-199 21 -84 -133 2002 2452 3 MP
+PP
+0 sg
+2002 2452 mt 1918 2319 L
+1918 2319 mt 1719 2340 L
+c14
+-51 -129 244 21 1841 2452 3 MP
+PP
+0 sg
+1841 2452 mt 2085 2473 L
+2085 2473 mt 2034 2344 L
+gr
+
+0 sg
+24 W
+1 sg
+2084 1577 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2082 1468 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2081 1270 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2080 1114 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2080 1148 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2078 1200 PD
+gs 655 283 3870 3023 rc
+c19
+-82 19 128 -96 1829 1018 3 MP
+PP
+0 sg
+1829 1018 mt 1957  922 L
+1957  922 mt 1875  941 L
+c21
+152 -89 59 22 1862 962 3 MP
+PP
+0 sg
+1862  962 mt 1921  984 L
+1921  984 mt 2073  895 L
+c20
+-166 -85 -9 17 2037 2691 3 MP
+PP
+0 sg
+2037 2691 mt 2028 2708 L
+2028 2708 mt 1862 2623 L
+c20
+-13 21 -162 -89 2037 2691 3 MP
+PP
+0 sg
+2037 2691 mt 1875 2602 L
+1875 2602 mt 1862 2623 L
+c20
+124 19 -152 -79 2073 2724 3 MP
+PP
+0 sg
+2073 2724 mt 1921 2645 L
+1921 2645 mt 2045 2664 L
+c20
+-152 -79 45 16 2028 2708 3 MP
+PP
+0 sg
+2028 2708 mt 2073 2724 L
+2073 2724 mt 1921 2645 L
+c21
+162 -79 -82 19 1957 922 3 MP
+PP
+0 sg
+1957  922 mt 1875  941 L
+1875  941 mt 2037  862 L
+c21
+45 17 166 -84 1862 962 3 MP
+PP
+0 sg
+1862  962 mt 2028  878 L
+2028  878 mt 2073  895 L
+gr
+
+0 sg
+24 W
+1 sg
+2072 1177 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2066 1251 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2063 1542 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2057 1488 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2047 1486 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2046 1220 PD
+gs 655 283 3870 3023 rc
+c17
+110 -115 -199 20 1918 1113 3 MP
+PP
+0 sg
+1918 1113 mt 1719 1133 L
+1719 1133 mt 1829 1018 L
+c17
+-173 18 84 -113 1918 1113 3 MP
+PP
+0 sg
+1918 1113 mt 2002 1000 L
+2002 1000 mt 1829 1018 L
+c19
+110 -113 149 23 1786 1093 3 MP
+PP
+0 sg
+1786 1093 mt 1935 1116 L
+1935 1116 mt 2045 1003 L
+c19
+124 19 135 -109 1786 1093 3 MP
+PP
+0 sg
+1786 1093 mt 1921  984 L
+1921  984 mt 2045 1003 L
+c18
+-110 -96 124 19 1921 2645 3 MP
+PP
+0 sg
+1921 2645 mt 2045 2664 L
+2045 2664 mt 1935 2568 L
+c21
+-9 16 162 -79 1875 941 3 MP
+PP
+0 sg
+1875  941 mt 2037  862 L
+2037  862 mt 2028  878 L
+gr
+
+0 sg
+24 W
+1 sg
+2037 1353 PD
+gs 655 283 3870 3023 rc
+c12
+40 -154 -242 26 1769 1538 3 MP
+PP
+0 sg
+1769 1538 mt 1527 1564 L
+1527 1564 mt 1567 1410 L
+c13
+269 24 56 -153 1709 1541 3 MP
+PP
+0 sg
+1709 1541 mt 1765 1388 L
+1765 1388 mt 2034 1412 L
+c8
+-242 26 10 -160 1759 1698 3 MP
+PP
+0 sg
+1759 1698 mt 1769 1538 L
+1769 1538 mt 1527 1564 L
+c13
+38 -154 287 25 1709 1541 3 MP
+PP
+0 sg
+1709 1541 mt 1996 1566 L
+1996 1566 mt 2034 1412 L
+c14
+-88 -143 -199 21 1918 2319 3 MP
+PP
+0 sg
+1918 2319 mt 1719 2340 L
+1719 2340 mt 1631 2197 L
+c14
+269 24 -76 -132 1841 2452 3 MP
+PP
+0 sg
+1841 2452 mt 1765 2320 L
+1765 2320 mt 2034 2344 L
+c14
+-219 23 -68 -145 1918 2319 3 MP
+PP
+0 sg
+1918 2319 mt 1850 2174 L
+1850 2174 mt 1631 2197 L
+c11
+-38 -143 269 24 1765 2320 3 MP
+PP
+0 sg
+1765 2320 mt 2034 2344 L
+2034 2344 mt 1996 2201 L
+gr
+
+0 sg
+24 W
+1 sg
+2028 1244 PD
+gs 655 283 3870 3023 rc
+c20
+59 22 -166 -85 2028 2708 3 MP
+PP
+0 sg
+2028 2708 mt 1862 2623 L
+1862 2623 mt 1921 2645 L
+c21
+166 -84 -13 21 1875 941 3 MP
+PP
+0 sg
+1875  941 mt 1862  962 L
+1862  962 mt 2028  878 L
+gr
+
+0 sg
+24 W
+1 sg
+2026 1236 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2022 1406 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2015 1452 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+2010 1495 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1997 1384 PD
+gs 655 283 3870 3023 rc
+c8
+13 -160 -245 26 1759 1698 3 MP
+PP
+0 sg
+1759 1698 mt 1514 1724 L
+1514 1724 mt 1527 1564 L
+c12
+287 25 33 -159 1676 1700 3 MP
+PP
+0 sg
+1676 1700 mt 1709 1541 L
+1709 1541 mt 1996 1566 L
+c11
+-64 -153 -219 23 1850 2174 3 MP
+PP
+0 sg
+1850 2174 mt 1631 2197 L
+1631 2197 mt 1567 2044 L
+c11
+-233 24 -50 -154 1850 2174 3 MP
+PP
+0 sg
+1850 2174 mt 1800 2020 L
+1800 2020 mt 1567 2044 L
+c10
+-22 -154 287 25 1709 2176 3 MP
+PP
+0 sg
+1709 2176 mt 1996 2201 L
+1996 2201 mt 1974 2047 L
+c11
+287 25 -56 -144 1765 2320 3 MP
+PP
+0 sg
+1765 2320 mt 1709 2176 L
+1709 2176 mt 1996 2201 L
+c9
+-245 26 -10 -162 1769 1860 3 MP
+PP
+0 sg
+1769 1860 mt 1759 1698 L
+1759 1698 mt 1514 1724 L
+c12
+22 -160 298 26 1676 1700 3 MP
+PP
+0 sg
+1676 1700 mt 1974 1726 L
+1974 1726 mt 1996 1566 L
+gr
+
+0 sg
+24 W
+1 sg
+1994 1140 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1990 1286 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1987 1174 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1984 1190 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1983 1305 PD
+gs 655 283 3870 3023 rc
+c10
+-40 -159 -233 24 1800 2020 3 MP
+PP
+0 sg
+1800 2020 mt 1567 2044 L
+1567 2044 mt 1527 1885 L
+c10
+298 25 -33 -154 1709 2176 3 MP
+PP
+0 sg
+1709 2176 mt 1676 2022 L
+1676 2022 mt 1974 2047 L
+c9
+-13 -161 -242 25 1769 1860 3 MP
+PP
+0 sg
+1769 1860 mt 1527 1885 L
+1527 1885 mt 1514 1724 L
+c10
+-242 25 -31 -160 1800 2020 3 MP
+PP
+0 sg
+1800 2020 mt 1769 1860 L
+1769 1860 mt 1527 1885 L
+c8
+8 -162 302 26 1664 1862 3 MP
+PP
+0 sg
+1664 1862 mt 1966 1888 L
+1966 1888 mt 1974 1726 L
+c9
+-8 -159 298 25 1676 2022 3 MP
+PP
+0 sg
+1676 2022 mt 1974 2047 L
+1974 2047 mt 1966 1888 L
+c8
+298 26 12 -162 1664 1862 3 MP
+PP
+0 sg
+1664 1862 mt 1676 1700 L
+1676 1700 mt 1974 1726 L
+gr
+
+0 sg
+24 W
+1 sg
+1973 1206 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1966 1393 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1966 1276 PD
+gs 655 283 3870 3023 rc
+c9
+302 26 -12 -160 1676 2022 3 MP
+PP
+0 sg
+1676 2022 mt 1664 1862 L
+1664 1862 mt 1966 1888 L
+gr
+
+0 sg
+24 W
+1 sg
+1955 1192 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1948 1369 PD
+gs 655 283 3870 3023 rc
+c18
+-147 -104 -13 21 1875 2602 3 MP
+PP
+0 sg
+1875 2602 mt 1862 2623 L
+1862 2623 mt 1715 2519 L
+c18
+-15 26 -145 -109 1875 2602 3 MP
+PP
+0 sg
+1875 2602 mt 1730 2493 L
+1730 2493 mt 1715 2519 L
+c18
+149 24 -135 -101 1921 2645 3 MP
+PP
+0 sg
+1921 2645 mt 1786 2544 L
+1786 2544 mt 1935 2568 L
+c17
+149 23 116 -126 1670 1219 3 MP
+PP
+0 sg
+1670 1219 mt 1786 1093 L
+1786 1093 mt 1935 1116 L
+c17
+94 -129 171 26 1670 1219 3 MP
+PP
+0 sg
+1670 1219 mt 1841 1245 L
+1841 1245 mt 1935 1116 L
+c16
+-94 -116 149 24 1786 2544 3 MP
+PP
+0 sg
+1786 2544 mt 1935 2568 L
+1935 2568 mt 1841 2452 L
+gr
+
+0 sg
+24 W
+1 sg
+1934 1411 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1930 1469 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1926 1292 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1922 1459 PD
+gs 655 283 3870 3023 rc
+c18
+-135 -101 59 22 1862 2623 3 MP
+PP
+0 sg
+1862 2623 mt 1921 2645 L
+1921 2645 mt 1786 2544 L
+c17
+124 -119 -113 27 1719 1133 3 MP
+PP
+0 sg
+1719 1133 mt 1606 1160 L
+1606 1160 mt 1730 1041 L
+c17
+-99 23 110 -115 1719 1133 3 MP
+PP
+0 sg
+1719 1133 mt 1829 1018 L
+1829 1018 mt 1730 1041 L
+c19
+145 -100 -99 23 1829 1018 3 MP
+PP
+0 sg
+1829 1018 mt 1730 1041 L
+1730 1041 mt 1875  941 L
+c19
+59 22 147 -105 1715 1067 3 MP
+PP
+0 sg
+1715 1067 mt 1862  962 L
+1862  962 mt 1921  984 L
+c19
+135 -109 71 26 1715 1067 3 MP
+PP
+0 sg
+1715 1067 mt 1786 1093 L
+1786 1093 mt 1921  984 L
+gr
+
+0 sg
+24 W
+1 sg
+1914 1488 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1898 1444 PD
+gs 655 283 3870 3023 rc
+gr
+
+24 W
+1894 1426 PD
+gs 655 283 3870 3023 rc
+c19
+-13 21 145 -100 1730 1041 3 MP
+PP
+0 sg
+1730 1041 mt 1875  941 L
+1875  941 mt 1862  962 L
+c19
+147 -105 -15 26 1730 1041 3 MP
+PP
+0 sg
+1730 1041 mt 1715 1067 L
+1715 1067 mt 1862  962 L
+c18
+71 25 -147 -104 1862 2623 3 MP
+PP
+0 sg
+1862 2623 mt 1715 2519 L
+1715 2519 mt 1786 2544 L
+gr
+
+0 sg
+24 W
+1 sg
+1862 1389 PD
+gs 655 283 3870 3023 rc
+c13
+-125 29 64 -145 1567 1410 3 MP
+PP
+0 sg
+1567 1410 mt 1631 1265 L
+1631 1265 mt 1506 1294 L
+c15
+76 -143 188 29 1577 1359 3 MP
+PP
+0 sg
+1577 1359 mt 1765 1388 L
+1765 1388 mt 1841 1245 L
+c15
+171 26 93 -140 1577 1359 3 MP
+PP
+0 sg
+1577 1359 mt 1670 1219 L
+1670 1219 mt 1841 1245 L
+c16
+-113 27 -110 -130 1829 2470 3 MP
+PP
+0 sg
+1829 2470 mt 1719 2340 L
+1719 2340 mt 1606 2367 L
+c16
+-124 -126 -99 23 1829 2470 3 MP
+PP
+0 sg
+1829 2470 mt 1730 2493 L
+1730 2493 mt 1606 2367 L
+c16
+171 26 -116 -118 1786 2544 3 MP
+PP
+0 sg
+1786 2544 mt 1670 2426 L
+1670 2426 mt 1841 2452 L
+c14
+-76 -132 171 26 1670 2426 3 MP
+PP
+0 sg
+1670 2426 mt 1841 2452 L
+1841 2452 mt 1765 2320 L
+c16
+-17 29 -124 -126 1730 2493 3 MP
+PP
+0 sg
+1730 2493 mt 1606 2367 L
+1606 2367 mt 1589 2396 L
+c16
+-126 -123 -15 26 1730 2493 3 MP
+PP
+0 sg
+1730 2493 mt 1715 2519 L
+1715 2519 mt 1589 2396 L
+c16
+-116 -118 71 25 1715 2519 3 MP
+PP
+0 sg
+1715 2519 mt 1786 2544 L
+1786 2544 mt 1670 2426 L
+c15
+100 -134 -125 29 1631 1265 3 MP
+PP
+0 sg
+1631 1265 mt 1506 1294 L
+1506 1294 mt 1606 1160 L
+c15
+-113 27 88 -132 1631 1265 3 MP
+PP
+0 sg
+1631 1265 mt 1719 1133 L
+1719 1133 mt 1606 1160 L
+c17
+71 26 126 -122 1589 1189 3 MP
+PP
+0 sg
+1589 1189 mt 1715 1067 L
+1715 1067 mt 1786 1093 L
+c17
+116 -126 81 30 1589 1189 3 MP
+PP
+0 sg
+1589 1189 mt 1670 1219 L
+1670 1219 mt 1786 1093 L
+c12
+-134 31 40 -154 1527 1564 3 MP
+PP
+0 sg
+1527 1564 mt 1567 1410 L
+1567 1410 mt 1433 1441 L
+c13
+56 -153 200 31 1509 1510 3 MP
+PP
+0 sg
+1509 1510 mt 1709 1541 L
+1709 1541 mt 1765 1388 L
+c13
+73 -147 -134 31 1567 1410 3 MP
+PP
+0 sg
+1567 1410 mt 1433 1441 L
+1433 1441 mt 1506 1294 L
+c13
+188 29 68 -151 1509 1510 3 MP
+PP
+0 sg
+1509 1510 mt 1577 1359 L
+1577 1359 mt 1765 1388 L
+c14
+-100 -141 -113 27 1719 2340 3 MP
+PP
+0 sg
+1719 2340 mt 1606 2367 L
+1606 2367 mt 1506 2226 L
+c14
+-125 29 -88 -143 1719 2340 3 MP
+PP
+0 sg
+1719 2340 mt 1631 2197 L
+1631 2197 mt 1506 2226 L
+c14
+188 29 -93 -135 1670 2426 3 MP
+PP
+0 sg
+1670 2426 mt 1577 2291 L
+1577 2291 mt 1765 2320 L
+c11
+-56 -144 188 29 1577 2291 3 MP
+PP
+0 sg
+1577 2291 mt 1765 2320 L
+1765 2320 mt 1709 2176 L
+c17
+-15 26 124 -119 1606 1160 3 MP
+PP
+0 sg
+1606 1160 mt 1730 1041 L
+1730 1041 mt 1715 1067 L
+c16
+81 30 -126 -123 1715 2519 3 MP
+PP
+0 sg
+1715 2519 mt 1589 2396 L
+1589 2396 mt 1670 2426 L
+c17
+126 -122 -17 29 1606 1160 3 MP
+PP
+0 sg
+1606 1160 mt 1589 1189 L
+1589 1189 mt 1715 1067 L
+c12
+44 -155 -138 32 1527 1564 3 MP
+PP
+0 sg
+1527 1564 mt 1389 1596 L
+1389 1596 mt 1433 1441 L
+c8
+-138 32 13 -160 1514 1724 3 MP
+PP
+0 sg
+1514 1724 mt 1527 1564 L
+1527 1564 mt 1389 1596 L
+c12
+200 31 42 -158 1467 1668 3 MP
+PP
+0 sg
+1467 1668 mt 1509 1510 L
+1509 1510 mt 1709 1541 L
+c12
+33 -159 209 32 1467 1668 3 MP
+PP
+0 sg
+1467 1668 mt 1676 1700 L
+1676 1700 mt 1709 1541 L
+c11
+-73 -151 -125 29 1631 2197 3 MP
+PP
+0 sg
+1631 2197 mt 1506 2226 L
+1506 2226 mt 1433 2075 L
+c11
+-134 31 -64 -153 1631 2197 3 MP
+PP
+0 sg
+1631 2197 mt 1567 2044 L
+1567 2044 mt 1433 2075 L
+c10
+-33 -154 200 32 1509 2144 3 MP
+PP
+0 sg
+1509 2144 mt 1709 2176 L
+1709 2176 mt 1676 2022 L
+c11
+200 32 -68 -147 1577 2291 3 MP
+PP
+0 sg
+1577 2291 mt 1509 2144 L
+1509 2144 mt 1709 2176 L
+c10
+-138 32 -40 -159 1567 2044 3 MP
+PP
+0 sg
+1567 2044 mt 1527 1885 L
+1527 1885 mt 1389 1917 L
+c10
+-44 -158 -134 31 1567 2044 3 MP
+PP
+0 sg
+1567 2044 mt 1433 2075 L
+1433 2075 mt 1389 1917 L
+c9
+-12 -160 209 33 1467 1989 3 MP
+PP
+0 sg
+1467 1989 mt 1676 2022 L
+1676 2022 mt 1664 1862 L
+c8
+15 -160 -140 32 1514 1724 3 MP
+PP
+0 sg
+1514 1724 mt 1374 1756 L
+1374 1756 mt 1389 1596 L
+c9
+-15 -161 -138 32 1527 1885 3 MP
+PP
+0 sg
+1527 1885 mt 1389 1917 L
+1389 1917 mt 1374 1756 L
+c9
+-140 32 -13 -161 1527 1885 3 MP
+PP
+0 sg
+1527 1885 mt 1514 1724 L
+1514 1724 mt 1374 1756 L
+c8
+209 32 14 -161 1453 1829 3 MP
+PP
+0 sg
+1453 1829 mt 1467 1668 L
+1467 1668 mt 1676 1700 L
+c8
+12 -162 211 33 1453 1829 3 MP
+PP
+0 sg
+1453 1829 mt 1664 1862 L
+1664 1862 mt 1676 1700 L
+c10
+209 33 -42 -155 1509 2144 3 MP
+PP
+0 sg
+1509 2144 mt 1467 1989 L
+1467 1989 mt 1676 2022 L
+c14
+-101 -137 -17 29 1606 2367 3 MP
+PP
+0 sg
+1606 2367 mt 1589 2396 L
+1589 2396 mt 1488 2259 L
+c14
+-18 33 -100 -141 1606 2367 3 MP
+PP
+0 sg
+1606 2367 mt 1506 2226 L
+1506 2226 mt 1488 2259 L
+c14
+-93 -135 81 30 1589 2396 3 MP
+PP
+0 sg
+1589 2396 mt 1670 2426 L
+1670 2426 mt 1577 2291 L
+c13
+-18 32 73 -147 1433 1441 3 MP
+PP
+0 sg
+1433 1441 mt 1506 1294 L
+1506 1294 mt 1488 1326 L
+c15
+93 -140 89 33 1488 1326 3 MP
+PP
+0 sg
+1488 1326 mt 1577 1359 L
+1577 1359 mt 1670 1219 L
+c15
+81 30 101 -137 1488 1326 3 MP
+PP
+0 sg
+1488 1326 mt 1589 1189 L
+1589 1189 mt 1670 1219 L
+c9
+211 33 -14 -160 1467 1989 3 MP
+PP
+0 sg
+1467 1989 mt 1453 1829 L
+1453 1829 mt 1664 1862 L
+c15
+-17 29 100 -134 1506 1294 3 MP
+PP
+0 sg
+1506 1294 mt 1606 1160 L
+1606 1160 mt 1589 1189 L
+c15
+101 -137 -18 32 1506 1294 3 MP
+PP
+0 sg
+1506 1294 mt 1488 1326 L
+1488 1326 mt 1589 1189 L
+c14
+89 32 -101 -137 1589 2396 3 MP
+PP
+0 sg
+1589 2396 mt 1488 2259 L
+1488 2259 mt 1577 2291 L
+c12
+-20 34 44 -155 1389 1596 3 MP
+PP
+0 sg
+1389 1596 mt 1433 1441 L
+1433 1441 mt 1413 1475 L
+c13
+68 -151 96 35 1413 1475 3 MP
+PP
+0 sg
+1413 1475 mt 1509 1510 L
+1509 1510 mt 1577 1359 L
+c11
+-75 -149 -18 33 1506 2226 3 MP
+PP
+0 sg
+1506 2226 mt 1488 2259 L
+1488 2259 mt 1413 2110 L
+c11
+-20 35 -73 -151 1506 2226 3 MP
+PP
+0 sg
+1506 2226 mt 1433 2075 L
+1433 2075 mt 1413 2110 L
+c11
+-68 -147 89 32 1488 2259 3 MP
+PP
+0 sg
+1488 2259 mt 1577 2291 L
+1577 2291 mt 1509 2144 L
+c13
+75 -149 -20 34 1433 1441 3 MP
+PP
+0 sg
+1433 1441 mt 1413 1475 L
+1413 1475 mt 1488 1326 L
+c13
+89 33 75 -149 1413 1475 3 MP
+PP
+0 sg
+1413 1475 mt 1488 1326 L
+1488 1326 mt 1577 1359 L
+c8
+-21 36 15 -160 1374 1756 3 MP
+PP
+0 sg
+1374 1756 mt 1389 1596 L
+1389 1596 mt 1368 1632 L
+c12
+45 -157 -21 36 1389 1596 3 MP
+PP
+0 sg
+1389 1596 mt 1368 1632 L
+1368 1632 mt 1413 1475 L
+c12
+96 35 45 -157 1368 1632 3 MP
+PP
+0 sg
+1368 1632 mt 1413 1475 L
+1413 1475 mt 1509 1510 L
+c10
+-21 36 -44 -158 1433 2075 3 MP
+PP
+0 sg
+1433 2075 mt 1389 1917 L
+1389 1917 mt 1368 1953 L
+c10
+-45 -157 -20 35 1433 2075 3 MP
+PP
+0 sg
+1433 2075 mt 1413 2110 L
+1413 2110 mt 1368 1953 L
+c10
+-42 -155 96 34 1413 2110 3 MP
+PP
+0 sg
+1413 2110 mt 1509 2144 L
+1509 2144 mt 1467 1989 L
+c12
+42 -158 99 36 1368 1632 3 MP
+PP
+0 sg
+1368 1632 mt 1467 1668 L
+1467 1668 mt 1509 1510 L
+c11
+96 34 -75 -149 1488 2259 3 MP
+PP
+0 sg
+1488 2259 mt 1413 2110 L
+1413 2110 mt 1509 2144 L
+c9
+-21 36 -15 -161 1389 1917 3 MP
+PP
+0 sg
+1389 1917 mt 1374 1756 L
+1374 1756 mt 1353 1792 L
+c8
+14 -161 100 37 1353 1792 3 MP
+PP
+0 sg
+1353 1792 mt 1453 1829 L
+1453 1829 mt 1467 1668 L
+c8
+15 -160 -21 36 1374 1756 3 MP
+PP
+0 sg
+1374 1756 mt 1353 1792 L
+1353 1792 mt 1368 1632 L
+c8
+99 36 15 -160 1353 1792 3 MP
+PP
+0 sg
+1353 1792 mt 1368 1632 L
+1368 1632 mt 1467 1668 L
+c10
+99 36 -45 -157 1413 2110 3 MP
+PP
+0 sg
+1413 2110 mt 1368 1953 L
+1368 1953 mt 1467 1989 L
+c9
+-14 -160 99 36 1368 1953 3 MP
+PP
+0 sg
+1368 1953 mt 1467 1989 L
+1467 1989 mt 1453 1829 L
+c9
+-15 -161 -21 36 1389 1917 3 MP
+PP
+0 sg
+1389 1917 mt 1368 1953 L
+1368 1953 mt 1353 1792 L
+c9
+100 37 -15 -161 1368 1953 3 MP
+PP
+0 sg
+1368 1953 mt 1353 1792 L
+1353 1792 mt 1453 1829 L
+gr
+
+0 sg
+
+end %%Color Dict
+
+eplot
+%%EndObject
+
+epage
+end
+
+showpage
+
+%%Trailer
+%%EOF
diff -Naur ns-3.22/src/spectrum/examples/tv-trans-example.cc ns-3.23/src/spectrum/examples/tv-trans-example.cc
--- ns-3.22/src/spectrum/examples/tv-trans-example.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/examples/tv-trans-example.cc	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,108 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#include <iostream>
+#include <stdlib.h>
+#include <ns3/core-module.h>
+#include <ns3/mobility-module.h>
+#include <ns3/spectrum-helper.h>
+#include <ns3/spectrum-analyzer-helper.h>
+#include <ns3/tv-spectrum-transmitter-helper.h>
+
+using namespace ns3;
+
+/**
+ * This example uses the TvSpectrumTransmitterHelper class to set up two 8-VSB
+ * TV transmitters with adjacent channels. Each transmitter's spectrum has a
+ * bandwidth of 6 MHz. The first TV transmitter has a start frequency of
+ * 524 MHz while the second has a start frequency of 530 MHz. These transmitters
+ * model ATSC (North American digital TV standard) channels 23 and 24.
+ *
+ * A spectrum analyzer is used to measure the transmitted spectra from the
+ * TV transmitters. The file "spectrum-analyzer-tv-sim-2-0.tr" contains its
+ * output post simulation (and can be plotted with Gnuplot or MATLAB).
+ */
+int main (int argc, char** argv)
+{
+  /* nodes and positions */
+  NodeContainer tvTransmitterNodes;
+  NodeContainer spectrumAnalyzerNodes;
+  NodeContainer allNodes;
+  tvTransmitterNodes.Create (2);
+  spectrumAnalyzerNodes.Create (1);
+  allNodes.Add (tvTransmitterNodes);
+  allNodes.Add (spectrumAnalyzerNodes);
+  MobilityHelper mobility;
+  Ptr<ListPositionAllocator> nodePositionList = CreateObject<ListPositionAllocator> ();
+  nodePositionList->Add (Vector (128000.0, 0.0, 0.0)); // TV Transmitter 1; 128 km away from spectrum analyzer 
+  nodePositionList->Add (Vector (0.0, 24000.0, 0.0)); // TV Transmitter 2; 24 km away from spectrum analyzer
+  nodePositionList->Add (Vector (0.0, 0.0, 0.0));  // Spectrum Analyzer
+  mobility.SetPositionAllocator (nodePositionList);
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  mobility.Install (allNodes);
+
+  /* channel and propagation */
+  SpectrumChannelHelper channelHelper = SpectrumChannelHelper::Default ();
+  channelHelper.SetChannel ("ns3::MultiModelSpectrumChannel");
+  // constant path loss added just to show capability to set different propagation loss models
+  // FriisSpectrumPropagationLossModel already added by default in SpectrumChannelHelper
+  channelHelper.AddSpectrumPropagationLoss ("ns3::ConstantSpectrumPropagationLossModel");
+  Ptr<SpectrumChannel> channel = channelHelper.Create ();
+  
+  /* TV transmitter setup */
+  TvSpectrumTransmitterHelper tvTransHelper;
+  tvTransHelper.SetChannel (channel);
+  tvTransHelper.SetAttribute ("StartFrequency", DoubleValue (524e6));
+  tvTransHelper.SetAttribute ("ChannelBandwidth", DoubleValue (6e6));
+  tvTransHelper.SetAttribute ("StartingTime", TimeValue (Seconds (0)));
+  tvTransHelper.SetAttribute ("TransmitDuration", TimeValue (Seconds (0.2)));
+  // 22.22 dBm/Hz from 1000 kW ERP transmit power, flat 6 MHz PSD spectrum assumed for this approximation 
+  tvTransHelper.SetAttribute ("BasePsd", DoubleValue (22.22)); 
+  tvTransHelper.SetAttribute ("TvType", EnumValue (TvSpectrumTransmitter::TVTYPE_8VSB));
+  tvTransHelper.SetAttribute ("Antenna", StringValue ("ns3::IsotropicAntennaModel"));
+  tvTransHelper.InstallAdjacent (tvTransmitterNodes);
+
+  /* frequency range for spectrum analyzer */
+  std::vector<double> freqs;
+  for (int i = 0; i < 200; ++i)
+    {
+      freqs.push_back ((i + 5200) * 1e5);
+    }
+  Ptr<SpectrumModel> spectrumAnalyzerFreqModel = Create<SpectrumModel> (freqs);
+
+  /* spectrum analyzer setup */
+  SpectrumAnalyzerHelper spectrumAnalyzerHelper;
+  spectrumAnalyzerHelper.SetChannel (channel);
+  spectrumAnalyzerHelper.SetRxSpectrumModel (spectrumAnalyzerFreqModel);
+  spectrumAnalyzerHelper.SetPhyAttribute ("NoisePowerSpectralDensity", DoubleValue (1e-15)); // -120 dBm/Hz
+  spectrumAnalyzerHelper.EnableAsciiAll ("spectrum-analyzer-tv-sim");
+  NetDeviceContainer spectrumAnalyzerDevices = spectrumAnalyzerHelper.Install (spectrumAnalyzerNodes);
+
+  Simulator::Stop (Seconds (0.4));
+
+  Simulator::Run ();
+
+  Simulator::Destroy ();
+
+  std::cout << "simulation done!" << std::endl;
+  std::cout << "see spectrum analyzer output file" << std::endl;
+
+  return 0;
+}
diff -Naur ns-3.22/src/spectrum/examples/tv-trans-regional-example.cc ns-3.23/src/spectrum/examples/tv-trans-regional-example.cc
--- ns-3.22/src/spectrum/examples/tv-trans-regional-example.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/examples/tv-trans-regional-example.cc	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,111 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#include <iostream>
+#include <stdlib.h>
+#include <ns3/core-module.h>
+#include <ns3/mobility-module.h>
+#include <ns3/spectrum-helper.h>
+#include <ns3/spectrum-analyzer-helper.h>
+#include <ns3/tv-spectrum-transmitter-helper.h>
+
+using namespace ns3;
+
+/**
+ * This example uses the TvSpectrumTransmitterHelper class to generate a random
+ * number of COFDM TV transmitters within a 250 km radius around latitude
+ * 48.86 degrees and longitude 2.35 degrees (Paris, France). The transmitters' 
+ * frequencies and bandwidths correspond to the European TV channel allocations.
+ * These TV transmitters model the digital DVB-T standard.
+ *
+ * A spectrum analyzer is used to measure the transmitted spectra from the
+ * TV transmitters. The file "spectrum-analyzer-tv-sim-regional-0-0.tr" contains
+ * its output post simulation (and can be plotted with Gnuplot or MATLAB).
+ */
+int main (int argc, char** argv)
+{
+  /* random seed and run number; adjust these to change random draws */
+  RngSeedManager::SetSeed(1);
+  RngSeedManager::SetRun(3);
+
+  /* nodes and positions */
+  NodeContainer spectrumAnalyzerNodes;
+  spectrumAnalyzerNodes.Create (1);
+  MobilityHelper mobility;
+  Ptr<ListPositionAllocator> nodePositionList = CreateObject<ListPositionAllocator> ();
+  Vector coordinates = GeographicPositions::GeographicToCartesianCoordinates (48.86, 
+                                                                              2.35, 
+                                                                              0,
+                                                                              GeographicPositions::SPHERE);
+  nodePositionList->Add (coordinates); // spectrum analyzer
+  mobility.SetPositionAllocator (nodePositionList);
+  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+  mobility.Install (spectrumAnalyzerNodes);
+
+  /* channel and propagation */
+  SpectrumChannelHelper channelHelper = SpectrumChannelHelper::Default ();
+  channelHelper.SetChannel ("ns3::MultiModelSpectrumChannel");
+  Ptr<SpectrumChannel> channel = channelHelper.Create ();
+  
+  /* TV transmitter setup */
+  TvSpectrumTransmitterHelper tvTransHelper;
+  tvTransHelper.SetChannel (channel);
+  tvTransHelper.SetAttribute ("StartingTime", TimeValue (Seconds (0.1)));
+  tvTransHelper.SetAttribute ("TransmitDuration", TimeValue (Seconds (0.1)));
+  // 7.96 dBm/Hz from 50 kW ERP transmit power, flat 8 MHz PSD spectrum assumed for this approximation 
+  tvTransHelper.SetAttribute ("BasePsd", DoubleValue (7.96));
+  tvTransHelper.SetAttribute ("TvType", EnumValue (TvSpectrumTransmitter::TVTYPE_COFDM));
+  tvTransHelper.SetAttribute ("Antenna", StringValue ("ns3::IsotropicAntennaModel"));
+
+  tvTransHelper.AssignStreams (300);
+  tvTransHelper.CreateRegionalTvTransmitters(TvSpectrumTransmitterHelper::REGION_EUROPE, 
+                                             TvSpectrumTransmitterHelper::DENSITY_MEDIUM, 
+                                             48.86, 
+                                             2.35, 
+                                             0,
+                                             250000);
+
+  /* frequency range for spectrum analyzer */
+  std::vector<double> freqs;
+  for (int i = 0; i < 6860; i = i + 5)
+    {
+      freqs.push_back ((i + 1740) * 1e5);
+    }
+  Ptr<SpectrumModel> spectrumAnalyzerFreqModel = Create<SpectrumModel> (freqs);
+
+  /* spectrum analyzer setup */
+  SpectrumAnalyzerHelper spectrumAnalyzerHelper;
+  spectrumAnalyzerHelper.SetChannel (channel);
+  spectrumAnalyzerHelper.SetRxSpectrumModel (spectrumAnalyzerFreqModel);
+  spectrumAnalyzerHelper.SetPhyAttribute ("NoisePowerSpectralDensity", DoubleValue (4.14e-21)); // approx -174 dBm/Hz
+  spectrumAnalyzerHelper.EnableAsciiAll ("spectrum-analyzer-tv-sim-regional");
+  NetDeviceContainer spectrumAnalyzerDevices = spectrumAnalyzerHelper.Install (spectrumAnalyzerNodes);
+
+  Simulator::Stop (Seconds (0.4));
+
+  Simulator::Run ();
+
+  Simulator::Destroy ();
+
+  std::cout << "simulation done!" << std::endl;
+  std::cout << "see spectrum analyzer output file" << std::endl;
+
+  return 0;
+}
diff -Naur ns-3.22/src/spectrum/examples/wscript ns-3.23/src/spectrum/examples/wscript
--- ns-3.22/src/spectrum/examples/wscript	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/examples/wscript	2015-05-13 11:05:26.000000000 -0700
@@ -13,4 +13,10 @@
                                  ['spectrum', 'mobility', 'internet', 'applications'])
     obj.source = 'adhoc-aloha-ideal-phy-with-microwave-oven.cc'
 
+    obj = bld.create_ns3_program('tv-trans-example',
+                                 ['spectrum', 'mobility', 'core'])
+    obj.source = 'tv-trans-example.cc'
 
+    obj = bld.create_ns3_program('tv-trans-regional-example',
+                                 ['spectrum', 'mobility', 'core'])
+    obj.source = 'tv-trans-regional-example.cc'
diff -Naur ns-3.22/src/spectrum/helper/tv-spectrum-transmitter-helper.cc ns-3.23/src/spectrum/helper/tv-spectrum-transmitter-helper.cc
--- ns-3.22/src/spectrum/helper/tv-spectrum-transmitter-helper.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/helper/tv-spectrum-transmitter-helper.cc	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,480 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#include <ns3/log.h>
+#include <cmath>
+#include <list>
+#include <vector>
+#include <ns3/uinteger.h>
+#include <ns3/double.h>
+#include <ns3/isotropic-antenna-model.h>
+#include <ns3/mobility-helper.h>
+#include <ns3/position-allocator.h>
+#include <ns3/geographic-positions.h>
+#include "tv-spectrum-transmitter-helper.h"
+
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("TvSpectrumTransmitterHelper");
+
+// NORTH AMERICA: 84 elements (index 0 - 83); valid channels = 2 - 83
+const int northAmericaArrayLength = 84;
+const double northAmericaStartFrequencies[84] = {0, 0, 54e6, 60e6, 66e6, 76e6, 
+  82e6, 174e6, 180e6, 186e6, 192e6, 198e6, 204e6, 210e6, 470e6, 476e6, 482e6, 
+  488e6, 494e6, 500e6, 506e6, 512e6, 518e6, 524e6, 530e6, 536e6, 542e6, 548e6, 
+  554e6, 560e6, 566e6, 572e6, 578e6, 584e6, 590e6, 596e6, 602e6, 608e6, 614e6, 
+  620e6, 626e6, 632e6, 638e6, 644e6, 650e6, 656e6, 662e6, 668e6, 674e6, 680e6, 
+  686e6, 692e6, 698e6, 704e6, 710e6, 716e6, 722e6, 728e6, 734e6, 740e6, 746e6, 
+  752e6, 758e6, 764e6, 770e6, 776e6, 782e6, 788e6, 794e6, 800e6, 806e6, 812e6, 
+  818e6, 824e6, 830e6, 836e6, 842e6, 848e6, 854e6, 860e6, 866e6, 872e6, 878e6, 
+  884e6};
+const double northAmericaEndFrequencies[84] = {0, 0, 60e6, 66e6, 72e6, 82e6, 
+  88e6, 180e6, 186e6, 192e6, 198e6, 204e6, 210e6, 216e6, 476e6, 482e6, 488e6, 
+  494e6, 500e6, 506e6, 512e6, 518e6, 524e6, 530e6, 536e6, 542e6, 548e6, 554e6, 
+  560e6, 566e6, 572e6, 578e6, 584e6, 590e6, 596e6, 602e6, 608e6, 614e6, 620e6, 
+  626e6, 632e6, 638e6, 644e6, 650e6, 656e6, 662e6, 668e6, 674e6, 680e6, 686e6, 
+  692e6, 698e6, 704e6, 710e6, 716e6, 722e6, 728e6, 734e6, 740e6, 746e6, 752e6, 
+  758e6, 764e6, 770e6, 776e6, 782e6, 788e6, 794e6, 800e6, 806e6, 812e6, 818e6, 
+  824e6, 830e6, 836e6, 842e6, 848e6, 854e6, 860e6, 866e6, 872e6, 878e6, 884e6, 
+  890e6};
+
+// EUROPE: 70 elements (index 0 - 69); valid channels = 5 - 12, 21 - 69
+const int europeArrayLength = 70;
+const double europeStartFrequencies[70] = {0, 0, 0, 0, 0, 174e6, 181e6, 188e6, 
+  195e6, 202e6, 209e6, 216e6, 223e6, 0, 0, 0, 0, 0, 0, 0, 0, 470e6, 478e6, 
+  486e6, 494e6, 502e6, 510e6, 518e6, 526e6, 534e6, 542e6, 550e6, 558e6, 566e6, 
+  574e6, 582e6, 590e6, 598e6, 606e6, 614e6, 622e6, 630e6, 638e6, 646e6, 654e6, 
+  662e6, 670e6, 678e6, 686e6, 694e6, 702e6, 710e6, 718e6, 726e6, 734e6, 742e6, 
+  750e6, 758e6, 766e6, 774e6, 782e6, 790e6, 798e6, 806e6, 814e6, 822e6, 830e6, 
+  838e6, 846e6, 854e6};
+const double europeEndFrequencies[70] = {0, 0, 0, 0, 0, 181e6, 188e6, 195e6, 
+  202e6, 209e6, 216e6, 223e6, 230e6, 0, 0, 0, 0, 0, 0, 0, 0, 478e6, 486e6, 
+  494e6, 502e6, 510e6, 518e6, 526e6, 534e6, 542e6, 550e6, 558e6, 566e6, 574e6, 
+  582e6, 590e6, 598e6, 606e6, 614e6, 622e6, 630e6, 638e6, 646e6, 654e6, 662e6, 
+  670e6, 678e6, 686e6, 694e6, 702e6, 710e6, 718e6, 726e6, 734e6, 742e6, 750e6, 
+  758e6, 766e6, 774e6, 782e6, 790e6, 798e6, 806e6, 814e6, 822e6, 830e6, 838e6, 
+  846e6, 854e6, 862e6};
+
+// JAPAN: 63 elements (index 0 - 62); valid channels = 1 - 62
+const int japanArrayLength = 63;
+const double japanStartFrequencies[63] = {0, 90e6, 96e6, 102e6, 170e6, 176e6, 
+  182e6, 188e6, 192e6, 198e6, 204e6, 210e6, 216e6, 470e6, 476e6, 482e6, 488e6, 
+  494e6, 500e6, 506e6, 512e6, 518e6, 524e6, 530e6, 536e6, 542e6, 548e6, 554e6, 
+  560e6, 566e6, 572e6, 578e6, 584e6, 590e6, 596e6, 602e6, 608e6, 614e6, 620e6, 
+  626e6, 632e6, 638e6, 644e6, 650e6, 656e6, 662e6, 668e6, 674e6, 680e6, 686e6, 
+  692e6, 698e6, 704e6, 710e6, 716e6, 722e6, 728e6, 734e6, 740e6, 746e6, 752e6, 
+  758e6, 764e6};
+const double japanEndFrequencies[63] = {0, 96e6, 102e6, 108e6, 176e6, 182e6, 
+  188e6, 194e6, 198e6, 204e6, 210e6, 216e6, 222e6, 476e6, 482e6, 488e6, 494e6, 
+  500e6, 506e6, 512e6, 518e6, 524e6, 530e6, 536e6, 542e6, 548e6, 554e6, 560e6, 
+  566e6, 572e6, 578e6, 584e6, 590e6, 596e6, 602e6, 608e6, 614e6, 620e6, 626e6, 
+  632e6, 638e6, 644e6, 650e6, 656e6, 662e6, 668e6, 674e6, 680e6, 686e6, 692e6, 
+  698e6, 704e6, 710e6, 716e6, 722e6, 728e6, 734e6, 740e6, 746e6, 752e6, 758e6, 
+  764e6, 770e6};
+
+TvSpectrumTransmitterHelper::TvSpectrumTransmitterHelper ()
+  : m_channel (0),
+    m_uniRand (CreateObject<UniformRandomVariable> ())
+{
+  NS_LOG_FUNCTION (this);
+  m_factory.SetTypeId ("ns3::TvSpectrumTransmitter");
+}
+
+TvSpectrumTransmitterHelper::~TvSpectrumTransmitterHelper ()
+{
+  m_channel = 0;
+  m_uniRand = 0;
+  NS_LOG_FUNCTION (this);
+}
+
+void
+TvSpectrumTransmitterHelper::SetChannel (Ptr<SpectrumChannel> c)
+{
+  NS_LOG_FUNCTION (this << c);
+  m_channel = c;
+}
+
+void
+TvSpectrumTransmitterHelper::SetAttribute (std::string name, const AttributeValue &val)
+{
+  m_factory.Set (name, val);
+}
+
+
+NetDeviceContainer
+TvSpectrumTransmitterHelper::Install (NodeContainer nodeCont)
+{
+  NS_LOG_FUNCTION (this);
+  NetDeviceContainer devCont;
+  //iterate over node container to make one transmitter for each given node
+  for (NodeContainer::Iterator i = nodeCont.Begin (); i != nodeCont.End (); ++i)
+    {
+      Ptr<Node> node = *i;
+      Ptr<TvSpectrumTransmitter> phy = m_factory.Create ()->GetObject<TvSpectrumTransmitter> ();
+      phy->CreateTvPsd ();
+      Ptr<NonCommunicatingNetDevice> dev = CreateObject<NonCommunicatingNetDevice> ();
+      NS_ASSERT (phy);
+      dev->SetPhy (phy);
+      NS_ASSERT (node);
+      phy->SetMobility (node->GetObject<MobilityModel> ());
+      NS_ASSERT (dev);
+      phy->SetDevice (dev);
+      NS_ASSERT (m_channel);
+      phy->SetChannel (m_channel);
+      dev->SetChannel (m_channel);
+      node->AddDevice (dev);
+      devCont.Add (dev);
+      phy->Start ();
+    }
+  return devCont;
+}
+
+
+NetDeviceContainer
+TvSpectrumTransmitterHelper::Install (NodeContainer nodeCont,
+                                      Region region,
+                                      uint16_t channelNumber)
+{
+  NS_LOG_FUNCTION (this);
+  NetDeviceContainer devCont;
+  double startFrequency;
+  double channelBandwidth;
+  if (region == REGION_NORTH_AMERICA)
+    {
+      NS_ASSERT_MSG (channelNumber < northAmericaArrayLength,
+                     "channel number " << channelNumber <<
+                     " does not exist for this region");
+      NS_ASSERT_MSG (northAmericaStartFrequencies[channelNumber] != 0,
+                     "channel number " << channelNumber <<
+                     " does not exist for this region");
+      startFrequency = northAmericaStartFrequencies[channelNumber];    
+      channelBandwidth = northAmericaEndFrequencies[channelNumber] - 
+                         northAmericaStartFrequencies[channelNumber];
+    }
+  else if (region == REGION_EUROPE)
+    {
+      NS_ASSERT_MSG (channelNumber < europeArrayLength,
+                     "channel number " << channelNumber <<
+                     " does not exist for this region");
+      NS_ASSERT_MSG (europeStartFrequencies[channelNumber] != 0,
+                     "channel number " << channelNumber <<
+                     " does not exist for this region");
+      startFrequency = europeStartFrequencies[channelNumber];    
+      channelBandwidth = europeEndFrequencies[channelNumber] - 
+                         europeStartFrequencies[channelNumber];
+    }
+  else if (region == REGION_JAPAN)
+    {
+      NS_ASSERT_MSG (channelNumber < japanArrayLength,
+                     "channel number " << channelNumber <<
+                     " does not exist for this region");
+      NS_ASSERT_MSG (japanStartFrequencies[channelNumber] != 0,
+                     "channel number " << channelNumber <<
+                     " does not exist for this region");
+      startFrequency = japanStartFrequencies[channelNumber];    
+      channelBandwidth = japanEndFrequencies[channelNumber] - 
+                         japanStartFrequencies[channelNumber];
+    }
+  //iterate over node container to make one transmitter for each given node
+  for (NodeContainer::Iterator i = nodeCont.Begin (); i != nodeCont.End (); ++i)
+    {
+      Ptr<Node> node = *i;
+      Ptr<TvSpectrumTransmitter> phy = m_factory.Create ()->GetObject<TvSpectrumTransmitter> ();
+      phy->SetAttribute ("StartFrequency", DoubleValue (startFrequency));
+      phy->SetAttribute ("ChannelBandwidth", DoubleValue (channelBandwidth));
+      phy->CreateTvPsd ();
+      Ptr<NonCommunicatingNetDevice> dev = CreateObject<NonCommunicatingNetDevice> ();
+      NS_ASSERT (phy);
+      dev->SetPhy (phy);
+      NS_ASSERT (node);
+      phy->SetMobility (node->GetObject<MobilityModel> ());
+      NS_ASSERT (dev);
+      phy->SetDevice (dev);
+      NS_ASSERT (m_channel);
+      phy->SetChannel (m_channel);
+      dev->SetChannel (m_channel);
+      node->AddDevice (dev);
+      devCont.Add (dev);
+      phy->Start ();
+    }
+  return devCont;
+}
+
+
+NetDeviceContainer
+TvSpectrumTransmitterHelper::InstallAdjacent (NodeContainer nodeCont)
+{
+  NS_LOG_FUNCTION (this);
+  NetDeviceContainer devCont;
+  int index = 0;
+  DoubleValue startFrequency;
+  DoubleValue channelBandwidth;
+  //iterate over node container to make one transmitter for each given node
+  for (NodeContainer::Iterator i = nodeCont.Begin (); i != nodeCont.End (); ++i)
+    {
+      Ptr<Node> node = *i;
+      Ptr<TvSpectrumTransmitter> phy = m_factory.Create ()->GetObject<TvSpectrumTransmitter> ();
+      phy->GetAttribute ("StartFrequency", startFrequency);
+      phy->GetAttribute ("ChannelBandwidth", channelBandwidth);
+      phy->SetAttribute ("StartFrequency", DoubleValue (startFrequency.Get () + 
+                         (index * channelBandwidth.Get ())));
+      phy->CreateTvPsd ();
+      Ptr<NonCommunicatingNetDevice> dev = CreateObject<NonCommunicatingNetDevice> ();
+      NS_ASSERT (phy);
+      dev->SetPhy (phy);
+      NS_ASSERT (node);
+      phy->SetMobility (node->GetObject<MobilityModel> ());
+      NS_ASSERT (dev);
+      phy->SetDevice (dev);
+      NS_ASSERT (m_channel);
+      phy->SetChannel (m_channel);
+      dev->SetChannel (m_channel);
+      node->AddDevice (dev);
+      devCont.Add (dev);
+      phy->Start ();
+      index++;
+    }
+  return devCont;
+}
+
+
+NetDeviceContainer
+TvSpectrumTransmitterHelper::InstallAdjacent (NodeContainer nodeCont,
+                                              Region region,
+                                              uint16_t channelNumber)
+{
+  NS_LOG_FUNCTION (this);
+  NetDeviceContainer devCont;
+  double startFrequency;
+  double channelBandwidth;
+  uint16_t currChannelNumber;
+  int index = 0;
+  //iterate over node container to make one transmitter for each given node
+  for (NodeContainer::Iterator i = nodeCont.Begin (); i != nodeCont.End (); ++i)
+    {
+      currChannelNumber = channelNumber + index;
+      if (region == REGION_NORTH_AMERICA)
+        {
+          NS_ASSERT_MSG (currChannelNumber < northAmericaArrayLength,
+                         "channel number " << currChannelNumber <<
+                         " does not exist for this region");
+          NS_ASSERT_MSG (northAmericaStartFrequencies[currChannelNumber] != 0,
+                         "channel number " << currChannelNumber <<
+                         " does not exist for this region");
+          startFrequency = northAmericaStartFrequencies[currChannelNumber];    
+          channelBandwidth = northAmericaEndFrequencies[currChannelNumber] 
+                             - northAmericaStartFrequencies[currChannelNumber];
+        }
+      else if (region == REGION_EUROPE)
+        {
+          NS_ASSERT_MSG (currChannelNumber < europeArrayLength,
+                         "channel number " << currChannelNumber <<
+                         " does not exist for this region");
+          NS_ASSERT_MSG (europeStartFrequencies[currChannelNumber] != 0,
+                         "channel number " << currChannelNumber <<
+                         " does not exist for this region");
+          startFrequency = europeStartFrequencies[currChannelNumber];    
+          channelBandwidth = europeEndFrequencies[currChannelNumber] - 
+                             europeStartFrequencies[currChannelNumber];
+        }
+      else if (region == REGION_JAPAN)
+        {
+          NS_ASSERT_MSG (currChannelNumber < japanArrayLength,
+                         "channel number " << currChannelNumber <<
+                         " does not exist for this region");
+          NS_ASSERT_MSG (japanStartFrequencies[currChannelNumber] != 0,
+                         "channel number " << currChannelNumber <<
+                         " does not exist for this region");
+          startFrequency = japanStartFrequencies[currChannelNumber];    
+          channelBandwidth = japanEndFrequencies[currChannelNumber] - 
+                             japanStartFrequencies[currChannelNumber];
+        }
+      Ptr<Node> node = *i;
+      Ptr<TvSpectrumTransmitter> phy = m_factory.Create ()->GetObject<TvSpectrumTransmitter> ();
+      phy->SetAttribute ("StartFrequency", DoubleValue (startFrequency));
+      phy->SetAttribute ("ChannelBandwidth", DoubleValue (channelBandwidth));
+      phy->CreateTvPsd ();
+      Ptr<NonCommunicatingNetDevice> dev = CreateObject<NonCommunicatingNetDevice> ();
+      NS_ASSERT (phy);
+      dev->SetPhy (phy);
+      NS_ASSERT (node);
+      phy->SetMobility (node->GetObject<MobilityModel> ());
+      NS_ASSERT (dev);
+      phy->SetDevice (dev);
+      NS_ASSERT (m_channel);
+      phy->SetChannel (m_channel);
+      dev->SetChannel (m_channel);
+      node->AddDevice (dev);
+      devCont.Add (dev);
+      phy->Start ();
+      index++;
+    }
+  return devCont;
+}
+
+
+int64_t
+TvSpectrumTransmitterHelper::AssignStreams (int64_t streamNum)
+{
+  m_uniRand->SetStream (streamNum);
+  return 1;
+}
+
+
+void
+TvSpectrumTransmitterHelper::CreateRegionalTvTransmitters (Region region, 
+                                                           Density density, 
+                                                           double originLatitude, 
+                                                           double originLongitude,
+                                                           double maxAltitude, 
+                                                           double maxRadius)
+{
+  NS_LOG_FUNCTION (this);
+  std::list<int> transmitterIndicesToCreate;
+  if (region == REGION_NORTH_AMERICA)
+    {
+      transmitterIndicesToCreate = GenerateRegionalTransmitterIndices 
+                                   (northAmericaStartFrequencies, 
+                                    northAmericaArrayLength, 
+                                    density);
+    }
+  else if (region == REGION_EUROPE)
+    {
+      transmitterIndicesToCreate = GenerateRegionalTransmitterIndices 
+                                   (europeStartFrequencies, 
+                                    europeArrayLength, 
+                                    density);
+    }
+  else if (region == REGION_JAPAN)
+    {
+      transmitterIndicesToCreate = GenerateRegionalTransmitterIndices 
+                                   (japanStartFrequencies, 
+                                    japanArrayLength, 
+                                    density);
+    }
+  std::list<Vector> tvTransmitterLocations = 
+    GeographicPositions::RandCartesianPointsAroundGeographicPoint (originLatitude, 
+                                                                   originLongitude, 
+                                                                   maxAltitude,
+                                                                   transmitterIndicesToCreate.size(), 
+                                                                   maxRadius,
+                                                                   m_uniRand);
+  InstallRandomRegionalTransmitters (region, 
+                                     transmitterIndicesToCreate, 
+                                     tvTransmitterLocations);
+}
+
+
+std::list<int>
+TvSpectrumTransmitterHelper::GenerateRegionalTransmitterIndices (const double startFrequencies[], 
+                                                                 const int startFrequenciesLength, 
+                                                                 Density density)
+{
+  std::vector<double> startFreqVector; //stores all non-zero start frequencies
+  for (int i = 0; i < startFrequenciesLength; i++)
+    {
+      double element = startFrequencies[i];
+      //add all non-zero frequencies to vector (0 means unused channel)
+      if (element != 0) startFreqVector.push_back(element);
+    }
+
+  //randomly generate number of transmitters to create based on density
+  uint32_t freqVectorSize = startFreqVector.size();
+  int randNumTransmitters = GetRandomNumTransmitters (density, freqVectorSize);
+ 
+  //stores start frequencies that transmitters will be created to transmit
+  std::vector<double> transmitterStartFreqsToCreate; 
+  for (int i = 0; i < randNumTransmitters; i++)
+    {
+      //get random index from start frequency vector
+      uint32_t randIndex = m_uniRand->GetInteger (0, startFreqVector.size () - 1);
+      //add start frequency corresponding to random index to vector 
+      transmitterStartFreqsToCreate.push_back(startFreqVector[randIndex]); 
+      //remove selected start frequency from vector so it is not selected again
+      startFreqVector.erase(startFreqVector.begin() + randIndex); 
+    }
+
+  //find indices on startFrequencies[] containing each start frequency that is 
+  //selected to be transmitted and add to list
+  std::list<int> transmitterIndicesToCreate;
+  for (int i = 0; i < (int)transmitterStartFreqsToCreate.size(); i++)
+    {
+      for (int channelNumberIndex = 0; 
+           channelNumberIndex < startFrequenciesLength; channelNumberIndex++)
+        {
+          if (startFrequencies[channelNumberIndex] == transmitterStartFreqsToCreate[i])
+            {
+              transmitterIndicesToCreate.push_back(channelNumberIndex);
+              break;
+            }
+        }
+    }
+  return transmitterIndicesToCreate;
+}
+
+
+int
+TvSpectrumTransmitterHelper::GetRandomNumTransmitters (Density density,
+                                                       uint32_t numChannels)
+{
+  int numTransmitters;
+  if (density == DENSITY_LOW)
+    {
+      numTransmitters = m_uniRand->GetInteger (1, ceil (0.33 * numChannels));
+    }
+  else if (density == DENSITY_MEDIUM)
+    {
+      numTransmitters = m_uniRand->GetInteger (ceil (0.33 * numChannels) + 1, ceil (0.66 * numChannels));
+    }  
+  else
+    {
+      numTransmitters = m_uniRand->GetInteger (ceil (0.66 * numChannels) + 1, numChannels);
+    }  
+  return numTransmitters;
+}
+
+
+void
+TvSpectrumTransmitterHelper::InstallRandomRegionalTransmitters (Region region, 
+                                                                std::list<int> transmitterIndicesToCreate, 
+                                                                std::list<Vector> transmitterLocations)
+{
+  int numTransmitters = (int)transmitterIndicesToCreate.size();
+  for (int transNum = 0; transNum < numTransmitters; transNum++)
+    {
+      Ptr<ListPositionAllocator> nodePosition = CreateObject<ListPositionAllocator> ();
+      // add generated coordinate point to node position
+      nodePosition->Add (transmitterLocations.front()); 
+      MobilityHelper mobility;
+      mobility.SetPositionAllocator (nodePosition);
+      mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
+      NodeContainer tvNode; // contains position of transmitter to be created
+      tvNode.Create (1);
+      mobility.Install (tvNode);
+      // set channel number for this transmitter
+      uint16_t channelNumber = (uint16_t) transmitterIndicesToCreate.front(); 
+      Install (tvNode, region, channelNumber); //install tv transmitter
+      transmitterLocations.pop_front(); // remove created transmitter location
+      transmitterIndicesToCreate.pop_front(); // remove created transmitter index
+    }
+}
+
+} // namespace ns3
+
diff -Naur ns-3.22/src/spectrum/helper/tv-spectrum-transmitter-helper.h ns-3.23/src/spectrum/helper/tv-spectrum-transmitter-helper.h
--- ns-3.22/src/spectrum/helper/tv-spectrum-transmitter-helper.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/helper/tv-spectrum-transmitter-helper.h	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,325 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#ifndef TV_SPECTRUM_TRANSMITTER_HELPER_H
+#define TV_SPECTRUM_TRANSMITTER_HELPER_H
+
+#include <ns3/spectrum-value.h>
+#include <ns3/spectrum-phy.h>
+#include <ns3/spectrum-channel.h>
+#include <ns3/antenna-model.h>
+#include <ns3/spectrum-signal-parameters.h>
+#include <ns3/mobility-model.h>
+#include <ns3/net-device.h>
+#include <ns3/net-device-container.h>
+#include <ns3/node-container.h>
+#include <ns3/non-communicating-net-device.h>
+#include <ns3/random-variable-stream.h>
+#include <ns3/tv-spectrum-transmitter.h>
+#include "ns3/object-factory.h"
+
+namespace ns3
+{
+
+/**
+ * \ingroup spectrum
+ *
+ * Helper class which uses TvSpectrumTransmitter class to create customizable 
+ * TV transmitter(s) that transmit PSD spectrum specified by user-set attributes.
+ * Has functionality to create TV transmitter(s) with actual frequencies of 
+ * specific geographic regions.
+ * Provides method to create a random set of transmitters within a given region 
+ * and location.
+ *
+ * Here is an example of how to use this class:
+ *
+ * TvSpectrumTransmitterHelper tvTransHelper;
+ * tvTransHelper.SetChannel (channel); // provided that user has a Ptr<SpectrumChannel> ready.
+ * tvTransHelper.SetAttribute ("StartFrequency", DoubleValue (524e6));
+ * tvTransHelper.SetAttribute ("ChannelBandwidth", DoubleValue (6e6));
+ * tvTransHelper.SetAttribute ("StartingTime", TimeValue (Seconds (0)));
+ * tvTransHelper.SetAttribute ("TransmitDuration", TimeValue (Seconds (0.2)));
+ * tvTransHelper.SetAttribute ("BasePsd", DoubleValue (22.22)); 
+ * tvTransHelper.SetAttribute ("TvType", EnumValue (TvSpectrumTransmitter::TVTYPE_8VSB));
+ * tvTransHelper.SetAttribute ("Antenna", StringValue ("ns3::IsotropicAntennaModel"));
+ * tvTransHelper.Install (tvTransmitterNode); //provided that user has a NodeContainer ready.
+ */
+class TvSpectrumTransmitterHelper
+{
+
+public:
+  /**
+   * geographical region that TV transmitters are being set up in
+   */
+  enum Region
+  {
+    REGION_NORTH_AMERICA,
+    REGION_JAPAN,
+    REGION_EUROPE
+  };
+
+  /**
+   * density of location that TV transmitters are being set up in
+   */
+  enum Density
+  {
+    DENSITY_LOW,
+    DENSITY_MEDIUM,
+    DENSITY_HIGH
+  };
+  
+  TvSpectrumTransmitterHelper (); //!< Default constructor
+  virtual ~TvSpectrumTransmitterHelper (); //!< Destructor
+
+  /** 
+   * Set the spectrum channel for the device(s) to transmit on
+   * 
+   * @param c a pointer to the spectrum channel
+   */
+  void SetChannel (Ptr<SpectrumChannel> c);
+
+  /** 
+   * Set attribute for each TvSpectrumTransmitter instance to be created 
+   * 
+   * @param name the name of the attribute to set
+   * @param val the value of the attribute to set
+   */
+  void SetAttribute (std::string name, const AttributeValue &val);
+
+  /** 
+   * Set up and start the TV Transmitter's transmission on the spectrum channel.
+   * Creates one TV Transmitter for each node given as an input, with settings 
+   * selected from attributes.
+   * Use SetAttribute() to select settings for the TV Transmitter(s).
+   * If multiple transmitters created, all will have same settings (frequency, 
+   * PSD, etc.) except for position/location, which depends on the positions 
+   * in the input NodeContainer.
+   *
+   * @param nodes a container containing the node(s) which the TV 
+   * transmitter(s) will be attached to
+   *
+   * @return a device container which contains all the devices created by this 
+   * method
+   */
+  NetDeviceContainer Install (NodeContainer nodes);
+
+  /** 
+   * Set up and start the TV Transmitter's transmission on the spectrum channel.
+   * Creates one TV Transmitter for each node given as an input, with settings 
+   * selected from attributes.
+   * Use SetAttribute() to select settings for the TV Transmitter(s).
+   * Transmitter(s) will be created with frequencies corresponding to the 
+   * user-selected channel number of the user-selected region.
+   * If multiple transmitters created, all will have same settings (frequency, 
+   * PSD, etc.) except for position/location, which depends on the positions 
+   * in the input NodeContainer.
+   *
+   * @param nodes a container containing the node(s) which the TV 
+   * transmitter(s) will be attached to
+   * @param region the region of which the transmitter(s) will be characterized
+   * @param channelNumber the TV channel number in the selected region that the 
+   * transmitter frequencies will be modeled after
+   *
+   * @return a device container which contains all the devices created by this 
+   * method
+   */
+  NetDeviceContainer Install (NodeContainer nodes,
+                              Region region,
+                              uint16_t channelNumber);
+
+  /** 
+   * Set up and start the TV Transmitter's transmission on the spectrum channel.
+   * Consecutively created transmitters (consecutive in input NodeContainer) 
+   * will have adjacent channels, i.e. a transmitter's frequency spectrum will 
+   * border (but not overlap) the frequency spectrum of the transmitter created 
+   * directly before it and the transmitter created directly after it.
+   * Creates one TV Transmitter for each node given as an input, with settings 
+   * selected from attributes.
+   * Use SetAttribute() to select settings for the TV Transmitter(s).
+   * If multiple transmitters created, they will have same settings except for 
+   * frequency and position/location.
+   * For each node, start frequency will be incremented by the channel bandwidth 
+   * that is set.
+   * For example, if two nodes are given as inputs to InstallAdjacent with 
+   * start frequency set to 500 MHz and channel bandwidth set to 6 MHz, the 
+   * first node will be a transmitter ranging from 500 MHz to 506 MHz and the 
+   * second node will be a transmitter ranging from 506 MHz to 512 MHz.
+   *
+   * @param nodes a container containing the node(s) which the TV 
+   * transmitter(s) will be attached to
+   *
+   * @return a device container which contains all the devices created by this 
+   * method
+   */
+  NetDeviceContainer InstallAdjacent (NodeContainer nodes);
+
+  /** 
+   * Set up and start the TV Transmitter's transmission on the spectrum channel.
+   * Consecutively created transmitters (consecutive in input NodeContainer) 
+   * will have adjacent channels, with the frequency spectrum and bandwidth of 
+   * each channel determined by the user-selected region.
+   * Creates one TV Transmitter for each node given as an input, with settings 
+   * selected from attributes.
+   * Use SetAttribute() to select settings for the TV Transmitter(s).
+   * The first created transmitter will have frequencies corresponding to the 
+   * user-selected channel number of the user-selected region.
+   * Each subsequently created transmitter will have its frequencies modeled 
+   * after the channel number (of the user-selected region) following the 
+   * previous one; for example if the first created transmitter is modeled after 
+   * channel 1, the next one created will be modeled after channel 2, and the 
+   * following one will be modeled after channel 3.
+   * If multiple transmitters created, they will have same settings except for 
+   * frequency and position/location.
+   *
+   * @param nodes a container containing the node(s) which the TV 
+   * transmitter(s) will be attached to
+   * @param region the region of which the transmitter(s) will be characterized
+   * @param channelNumber the TV channel number in the selected region that the 
+   * first created transmitter's frequencies will be modeled after
+   *
+   * @return a device container which contains all the devices created by this 
+   * method
+   */
+  NetDeviceContainer InstallAdjacent (NodeContainer nodes,
+                                      Region region,
+                                      uint16_t channelNumber);
+
+  /**
+   * Assigns the stream number for the uniform random number generator to use
+   *
+   * @param stream first stream index to use
+   * @return the number of stream indices assigned by this helper
+   */
+  int64_t AssignStreams (int64_t streamNum);
+
+  /**
+   * Generates and installs (starts transmission on the spectrum channel) a 
+   * random number of TV transmitters with channel frequencies corresponding 
+   * to the given region at random locations on or above earth. 
+   * The generated transmitters are located at randomly selected points within a 
+   * given altitude above earth's surface centered around a given origin point 
+   * (on earth's surface) within a given distance radius, corresponding to a 
+   * uniform distribution.
+   * Distance radius is measured as if all points are on earth's surface
+   * (with altitude = 0).
+   * Assumes earth is a perfect sphere.
+   * The given region's channel numbers that the generated TV transmitters' 
+   * frequency spectra are modeled after are uniformly selected at random.
+   * These channel numbers are never repeated.
+   * The number of transmitters generated is uniformly random based on given 
+   * density.
+   * Each transmitter has BasePsd and TvType set from SetAttribute(), which 
+   * should be set before calling this method.
+   * 
+   * @param region the region that the transmitters are in
+   * @param density the density (high, medium, or low) of the location being 
+   * simulated, which determines how many transmitters are created and how many 
+   * channels are occupied. Low density will generate between one and one third 
+   * of the number of TV channels in the given region, medium density will 
+   * generate between one third and two thirds, and high density will generate 
+   * between two thirds and all of the channels.
+   * @param originLatitude origin point latitude in degrees
+   * @param originLongitude origin point longitude in degrees
+   * @param maxAltitude maximum altitude in meters above earth's surface with
+   * which random points can be generated
+   * @param maxRadius max distance in meters from origin with which random 
+   * transmitters can be generated (all transmitters are less than or equal to 
+   * this distance from the origin, relative to points being on earth's surface)
+   */
+  void CreateRegionalTvTransmitters (Region region, 
+                                     Density density, 
+                                     double originLatitude, 
+                                     double originLongitude, 
+                                     double maxAltitude,
+                                     double maxRadius);
+
+
+private:
+  Ptr<SpectrumChannel> m_channel; //!< Pointer to spectrum channel object
+
+  /**
+   * Generates random indices of given region frequency array (ignoring indices 
+   * referring to invalid channels).
+   * Number of indices generated (which is number of TV transmitters to be 
+   * created) is random based on given density.
+   * Indices generated refer to frequencies that TV transmitters will be 
+   * created with.
+   * 
+   * @param startFrequencies array containing all channel start frequencies for 
+   * a particular region
+   * @param startFrequenciesLength number of elements in startFrequencies array
+   * @param density the density (high, medium, or low) of the location being 
+   * simulated, which determines how many transmitters are created
+   *
+   * @return a list contaning the indices in startFrequencies that transmitters 
+   * will be created for
+   */
+  std::list<int> GenerateRegionalTransmitterIndices (const double startFrequencies[], 
+                                                     const int startFrequenciesLength, 
+                                                     Density density);
+  
+  /**
+   * Randomly generates the number of TV transmitters to be created based on 
+   * given density and number of possible TV channels. 
+   * Low density will generate a transmitter for between one (a single 
+   * transmitter) and one third of the number of possible channels, medium 
+   * density will generate a transmitter for between one third and two thirds, 
+   * and high density will generate a transmitter for between two thirds and all 
+   * of the possible channels. 
+   * These ratios are approximated in the implementation, but there is no 
+   * overlap possible in the number of transmitters generated between adjacent 
+   * densities. 
+   * For example, given 60 possible channels, for low density between 1 and 20 
+   * transmitters can be created, for medium density between 21 and 40 
+   * transmitters can be created, and for high density between 41 and 60 
+   * transmitters can be created (all inclusive).
+   * 
+   * @param density the density (high, medium, or low) of the location being 
+   * simulated
+   * @param numChannels the number of possible TV channels in the region being 
+   * simulated
+   *
+   * @return the number of TV transmitters that will be created
+   */
+  int GetRandomNumTransmitters (Density density, uint32_t numChannels);
+
+  /**
+   * Installs each randomly generated regional TV transmitter
+   * 
+   * @param region the region that the transmitters are in
+   * @param transmitterIndicesToCreate a list contaning the channel number 
+   * indices (for region's start frequencies array) that transmitters will be 
+   * created for; this is returned from GenerateRegionalTransmitterIndices()
+   * @param transmitterLocations a list containing the vectors 
+   * (x, y, z location) of each TV transmitter to be generated; this is 
+   * returned from RandGeographicCoordsAroundPoint()
+   */
+  void InstallRandomRegionalTransmitters (Region region, 
+                                          std::list<int> transmitterIndicesToCreate, 
+                                          std::list<Vector> transmitterLocations);
+
+  ObjectFactory m_factory; //!< Object factory for attribute setting
+  Ptr<UniformRandomVariable> m_uniRand; //!< Object to generate uniform random numbers
+
+};
+
+} // namespace ns3
+
+#endif /* TV_SPECTRUM_TRANSMITTER_HELPER_H */
diff -Naur ns-3.22/src/spectrum/model/aloha-noack-mac-header.cc ns-3.23/src/spectrum/model/aloha-noack-mac-header.cc
--- ns-3.22/src/spectrum/model/aloha-noack-mac-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/aloha-noack-mac-header.cc	2015-05-13 11:05:26.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::AlohaNoackMacHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<AlohaNoackMacHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/spectrum/model/aloha-noack-net-device.cc ns-3.23/src/spectrum/model/aloha-noack-net-device.cc
--- ns-3.22/src/spectrum/model/aloha-noack-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/aloha-noack-net-device.cc	2015-05-13 11:05:26.000000000 -0700
@@ -60,6 +60,7 @@
 {
   static TypeId tid = TypeId ("ns3::AlohaNoackNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<AlohaNoackNetDevice> ()
     .AddAttribute ("Address",
                    "The MAC address of this device.",
diff -Naur ns-3.22/src/spectrum/model/constant-spectrum-propagation-loss.cc ns-3.23/src/spectrum/model/constant-spectrum-propagation-loss.cc
--- ns-3.22/src/spectrum/model/constant-spectrum-propagation-loss.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/constant-spectrum-propagation-loss.cc	2015-05-13 11:05:26.000000000 -0700
@@ -47,6 +47,7 @@
 {
   static TypeId tid = TypeId ("ns3::ConstantSpectrumPropagationLossModel")
     .SetParent<SpectrumPropagationLossModel> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<ConstantSpectrumPropagationLossModel> ()
     .AddAttribute ("Loss",
                    "Path loss (dB) between transmitter and receiver",
diff -Naur ns-3.22/src/spectrum/model/friis-spectrum-propagation-loss.cc ns-3.23/src/spectrum/model/friis-spectrum-propagation-loss.cc
--- ns-3.22/src/spectrum/model/friis-spectrum-propagation-loss.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/friis-spectrum-propagation-loss.cc	2015-05-13 11:05:26.000000000 -0700
@@ -42,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::FriisSpectrumPropagationLossModel")
     .SetParent<SpectrumPropagationLossModel> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<FriisSpectrumPropagationLossModel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/spectrum/model/half-duplex-ideal-phy.cc ns-3.23/src/spectrum/model/half-duplex-ideal-phy.cc
--- ns-3.22/src/spectrum/model/half-duplex-ideal-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/half-duplex-ideal-phy.cc	2015-05-13 11:05:26.000000000 -0700
@@ -288,8 +288,8 @@
         m_txPacket = p;
         ChangeState (TX);
         Ptr<HalfDuplexIdealPhySignalParameters> txParams = Create<HalfDuplexIdealPhySignalParameters> ();
-        double txTimeSeconds = m_rate.CalculateTxTime (p->GetSize ());
-        txParams->duration = Seconds (txTimeSeconds);
+        Time txTimeSeconds = m_rate.CalculateBytesTxTime (p->GetSize ());
+        txParams->duration = txTimeSeconds;
         txParams->txPhy = GetObject<SpectrumPhy> ();
         txParams->txAntenna = m_antenna;
         txParams->psd = m_txPsd;
@@ -297,7 +297,7 @@
 
         NS_LOG_LOGIC (this << " tx power: " << 10 * std::log10 (Integral (*(txParams->psd))) + 30 << " dBm");
         m_channel->StartTx (txParams);
-        Simulator::Schedule (Seconds (txTimeSeconds), &HalfDuplexIdealPhy::EndTx, this);
+        Simulator::Schedule (txTimeSeconds, &HalfDuplexIdealPhy::EndTx, this);
       }
       break;
 
diff -Naur ns-3.22/src/spectrum/model/multi-model-spectrum-channel.cc ns-3.23/src/spectrum/model/multi-model-spectrum-channel.cc
--- ns-3.22/src/spectrum/model/multi-model-spectrum-channel.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/multi-model-spectrum-channel.cc	2015-05-13 11:05:26.000000000 -0700
@@ -97,6 +97,7 @@
 {
   static TypeId tid = TypeId ("ns3::MultiModelSpectrumChannel")
     .SetParent<SpectrumChannel> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<MultiModelSpectrumChannel> ()
     .AddAttribute ("MaxLossDb",
                    "If a single-frequency PropagationLossModel is used, "
@@ -411,6 +412,7 @@
             {
               return (*phyIt)->GetDevice ();
             }
+          j++;
         }
     }
   NS_FATAL_ERROR ("m_numDevice > actual number of devices");
diff -Naur ns-3.22/src/spectrum/model/non-communicating-net-device.cc ns-3.23/src/spectrum/model/non-communicating-net-device.cc
--- ns-3.22/src/spectrum/model/non-communicating-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/non-communicating-net-device.cc	2015-05-13 11:05:26.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::NonCommunicatingNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<NonCommunicatingNetDevice> ()
     .AddAttribute ("Phy", "The PHY layer attached to this device.",
                    PointerValue (),
diff -Naur ns-3.22/src/spectrum/model/single-model-spectrum-channel.cc ns-3.23/src/spectrum/model/single-model-spectrum-channel.cc
--- ns-3.22/src/spectrum/model/single-model-spectrum-channel.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/single-model-spectrum-channel.cc	2015-05-13 11:05:26.000000000 -0700
@@ -67,6 +67,7 @@
   NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::SingleModelSpectrumChannel")
     .SetParent<SpectrumChannel> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<SingleModelSpectrumChannel> ()
     .AddAttribute ("MaxLossDb",
                    "If a single-frequency PropagationLossModel is used, "
diff -Naur ns-3.22/src/spectrum/model/spectrum-analyzer.cc ns-3.23/src/spectrum/model/spectrum-analyzer.cc
--- ns-3.22/src/spectrum/model/spectrum-analyzer.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/spectrum-analyzer.cc	2015-05-13 11:05:26.000000000 -0700
@@ -71,6 +71,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumAnalyzer")
     .SetParent<SpectrumPhy> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<SpectrumAnalyzer> ()
     .AddAttribute ("Resolution",
                    "The lengh of the time interval over which the "
diff -Naur ns-3.22/src/spectrum/model/spectrum-channel.cc ns-3.23/src/spectrum/model/spectrum-channel.cc
--- ns-3.22/src/spectrum/model/spectrum-channel.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/spectrum-channel.cc	2015-05-13 11:05:26.000000000 -0700
@@ -31,6 +31,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumChannel")
     .SetParent<Channel> ()
+    .SetGroupName ("Spectrum")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/spectrum/model/spectrum-error-model.cc ns-3.23/src/spectrum/model/spectrum-error-model.cc
--- ns-3.22/src/spectrum/model/spectrum-error-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/spectrum-error-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumErrorModel")
     .SetParent<Object> ()
+    .SetGroupName ("Spectrum")
     ;
   return tid;
 }
diff -Naur ns-3.22/src/spectrum/model/spectrum-phy.cc ns-3.23/src/spectrum/model/spectrum-phy.cc
--- ns-3.22/src/spectrum/model/spectrum-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/spectrum-phy.cc	2015-05-13 11:05:26.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumPhy")
     .SetParent<Object> ()
+    .SetGroupName ("Spectrum")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/spectrum/model/spectrum-propagation-loss-model.cc ns-3.23/src/spectrum/model/spectrum-propagation-loss-model.cc
--- ns-3.22/src/spectrum/model/spectrum-propagation-loss-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/spectrum-propagation-loss-model.cc	2015-05-13 11:05:26.000000000 -0700
@@ -48,6 +48,7 @@
 {
   static TypeId tid = TypeId ("ns3::SpectrumPropagationLossModel")
     .SetParent<Object> ()
+    .SetGroupName ("Spectrum")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/spectrum/model/tv-spectrum-transmitter.cc ns-3.23/src/spectrum/model/tv-spectrum-transmitter.cc
--- ns-3.22/src/spectrum/model/tv-spectrum-transmitter.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/model/tv-spectrum-transmitter.cc	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,581 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#include <ns3/log.h>
+#include <ns3/simulator.h>
+#include <ns3/enum.h>
+#include <ns3/uinteger.h>
+#include <ns3/double.h>
+#include <ns3/integer.h>
+#include <ns3/string.h>
+#include <ns3/pointer.h>
+#include <ns3/isotropic-antenna-model.h>
+#include <ns3/antenna-model.h>
+#include <cmath>
+#include "tv-spectrum-transmitter.h"
+
+namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("TvSpectrumTransmitter");
+
+NS_OBJECT_ENSURE_REGISTERED (TvSpectrumTransmitter);
+
+TvSpectrumTransmitter::TvSpectrumTransmitter ()
+  : m_mobility (0),
+    m_antenna (CreateObject<IsotropicAntennaModel> ()),
+    m_netDevice (0),
+    m_channel (0),
+    m_tvType (TVTYPE_8VSB),
+    m_startFrequency (500e6),
+    m_channelBandwidth (6e6),
+    m_basePsd (20),
+    m_txPsd (0),
+    m_startingTime (Seconds (0)),
+    m_transmitDuration (Seconds (0.2)),
+    m_active (false)
+{
+  NS_LOG_FUNCTION (this);
+}
+
+TvSpectrumTransmitter::~TvSpectrumTransmitter ()
+{
+  m_mobility = 0;
+  m_antenna = 0;
+  m_netDevice = 0;
+  m_channel = 0;
+  m_txPsd = 0;
+  NS_LOG_FUNCTION (this);
+}
+
+TypeId
+TvSpectrumTransmitter::GetTypeId(void)
+{
+  static TypeId tid = TypeId("ns3::TvSpectrumTransmitter")
+    .SetParent<SpectrumPhy> ()
+    .SetGroupName ("Spectrum")
+    .AddConstructor<TvSpectrumTransmitter> ()
+    .AddAttribute ("TvType",
+                   "The type of TV transmitter/modulation to be used.",
+                   EnumValue (TvSpectrumTransmitter::TVTYPE_8VSB),
+                   MakeEnumAccessor (&TvSpectrumTransmitter::m_tvType),
+                   MakeEnumChecker (TvSpectrumTransmitter::TVTYPE_8VSB, "8vsb",
+                                    TvSpectrumTransmitter::TVTYPE_COFDM, "cofdm",
+                                    TvSpectrumTransmitter::TVTYPE_ANALOG, "analog"))
+    .AddAttribute ("StartFrequency",
+                   "The lower end frequency (in Hz) of the TV transmitter's "
+                   "signal. Must be greater than or equal to 0.",
+                   DoubleValue (500e6),
+                   MakeDoubleAccessor (&TvSpectrumTransmitter::m_startFrequency),
+                   MakeDoubleChecker<double> (0, std::numeric_limits<double>::max ()))
+    .AddAttribute ("ChannelBandwidth",
+                   "The bandwidth (in Hz) of the TV transmitter's signal. Must "
+                   "be greater than or equal to 0.",
+                   DoubleValue (6e6),
+                   MakeDoubleAccessor (&TvSpectrumTransmitter::m_channelBandwidth),
+                   MakeDoubleChecker<double> (0, std::numeric_limits<double>::max ()))
+    .AddAttribute ("BasePsd",
+                   "The base power spectral density (in dBm/Hz) of the TV "
+                   "transmitter's transmitted spectrum. Base PSD is the "
+                   "maximum PSD of the spectrum excluding pilots. For analog "
+                   "and COFDM transmitters this is the maximum PSD, but for "
+                   "8-VSB transmitters this is the maximum PSD of the main "
+                   "signal spectrum (flat-top segment) since the pilot "
+                   "actually has the maximum PSD overall.",
+                   DoubleValue (20),
+                   MakeDoubleAccessor (&TvSpectrumTransmitter::m_basePsd),
+                   MakeDoubleChecker<double> ())
+    .AddAttribute ("Antenna",
+                   "The AntennaModel to be used. Allows classes inherited "
+                   "from ns3::AntennaModel. Defaults to ns3::IsotropicAntennaModel.",
+                   StringValue ("ns3::IsotropicAntennaModel"),
+                   MakePointerAccessor (&TvSpectrumTransmitter::m_antenna),
+                   MakePointerChecker<AntennaModel> ())
+    .AddAttribute ("StartingTime",
+                   "The time point after the simulation begins in which the TV "
+                   "transmitter will begin transmitting.",
+                   TimeValue (Seconds (0)),
+                   MakeTimeAccessor (&TvSpectrumTransmitter::m_startingTime),
+                   MakeTimeChecker ())
+    .AddAttribute ("TransmitDuration",
+                   "The duration of time that the TV transmitter will transmit for.",
+                   TimeValue (Seconds (0.2)),
+                   MakeTimeAccessor (&TvSpectrumTransmitter::m_transmitDuration),
+                   MakeTimeChecker ())
+  ;
+  return tid;
+}
+
+void
+TvSpectrumTransmitter::SetChannel (Ptr<SpectrumChannel> c)
+{
+  NS_LOG_FUNCTION (this << c);
+  m_channel = c;
+}
+
+void
+TvSpectrumTransmitter::SetMobility (Ptr<MobilityModel> m)
+{
+  NS_LOG_FUNCTION (this << m);
+  m_mobility = m;
+}
+
+void
+TvSpectrumTransmitter::SetDevice (Ptr<NetDevice> d)
+{
+  NS_LOG_FUNCTION (this << d);
+  m_netDevice = d;
+}
+
+Ptr<MobilityModel>
+TvSpectrumTransmitter::GetMobility ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_mobility;
+}
+
+Ptr<NetDevice>
+TvSpectrumTransmitter::GetDevice ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_netDevice;
+}
+
+Ptr<const SpectrumModel>
+TvSpectrumTransmitter::GetRxSpectrumModel () const
+{
+  NS_LOG_FUNCTION (this);
+  return 0;
+}
+
+Ptr<AntennaModel>
+TvSpectrumTransmitter::GetRxAntenna ()
+{
+  NS_LOG_FUNCTION (this);
+  return m_antenna;
+}
+
+void
+TvSpectrumTransmitter::StartRx (Ptr<SpectrumSignalParameters> params)
+{
+  NS_LOG_FUNCTION (this << params);
+}
+
+
+Ptr<SpectrumChannel>
+TvSpectrumTransmitter::GetChannel () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_channel;
+}
+
+// Used as key for map containing created spectrum models
+struct TvSpectrumModelId
+{
+  TvSpectrumModelId (double stFreq, double bwidth);
+  double startFrequency;
+  double bandwidth;
+};
+
+TvSpectrumModelId::TvSpectrumModelId (double stFreq, double bwidth)
+  : startFrequency (stFreq), 
+    bandwidth (bwidth)
+{
+}
+
+bool
+operator < (const TvSpectrumModelId& a, const TvSpectrumModelId& b)
+{
+  return ( (a.startFrequency < b.startFrequency) || 
+           ( (a.startFrequency == b.startFrequency) && (a.bandwidth < b.bandwidth) ) );
+}
+
+// Stores created spectrum models
+static std::map<TvSpectrumModelId, Ptr<SpectrumModel> > g_tvSpectrumModelMap;
+
+/** 
+ * 8-VSB PSD approximated from Figure 3 of the following article:
+ * Baron, Stanley. "First-Hand:Digital Television: The Digital Terrestrial 
+ * Television Broadcasting (DTTB) Standard." IEEE Global History Network.
+ * <http://www.ieeeghn.org/wiki/index.php/First-Hand:Digital_Television:_The_
+ * Digital_Terrestrial_Television_Broadcasting_(DTTB)_Standard>.
+ *
+ * COFDM PSD approximated from Figure 12 (8k mode) of the following article:
+ * Kopp, Carlo. "High Definition Television." High Definition Television. Air 
+ * Power Australia. <http://www.ausairpower.net/AC-1100.html>.
+ *
+ * Analog PSD approximated from Figure 4 of the following paper:
+ * Stephen Shellhammer, Ahmed Sadek, and Wenyi Zhang. "Technical Challenges for 
+ * Cognitive Radio in the TV White Space Spectrum." Qualcomm Incorporated.
+ */
+void
+TvSpectrumTransmitter::CreateTvPsd ()
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT (m_channelBandwidth != 0);
+  Ptr<SpectrumModel> model;
+  TvSpectrumModelId key (m_startFrequency, m_channelBandwidth);
+  std::map<TvSpectrumModelId, Ptr<SpectrumModel> >::iterator iter = g_tvSpectrumModelMap.find (key);
+  if (iter != g_tvSpectrumModelMap.end ())
+    {
+      model = iter->second; //set SpectrumModel to previously created one
+    }
+  else // no previously created SpectrumModel with same frequency and bandwidth
+    {
+      Bands bands;
+      double halfSubBand = 0.5 * (m_channelBandwidth / 100);
+      for (double fl = m_startFrequency - halfSubBand; fl <= (m_startFrequency - 
+           halfSubBand) + m_channelBandwidth; fl += m_channelBandwidth / 100)
+        {
+          BandInfo bi;
+          bi.fl = fl;
+          bi.fc = fl + halfSubBand;
+          bi.fh = fl + (2 * halfSubBand);
+          bands.push_back (bi);
+        }
+      model = Create<SpectrumModel> (bands);
+      g_tvSpectrumModelMap.insert (std::pair<TvSpectrumModelId, Ptr<SpectrumModel> > (key, model));
+    }
+  Ptr<SpectrumValue> psd = Create<SpectrumValue> (model);
+  double basePsdWattsHz = pow (10.0, (m_basePsd - 30) / 10.0); //convert dBm to W/Hz
+  switch (m_tvType)
+    {
+      case TVTYPE_8VSB:
+        {
+          for (int i = 0; i <= 100; i++)
+            {     
+              switch (i)
+                {  
+                  case 0: 
+                  case 100: 
+                    (*psd) [i] = 0.015 * basePsdWattsHz;
+                    break;
+                  case 1: 
+                  case 99: 
+                    (*psd) [i] = 0.019 * basePsdWattsHz;
+                    break;
+                  case 2: 
+                  case 98: 
+                    (*psd) [i] = 0.034 * basePsdWattsHz;
+                    break;
+                  case 3: 
+                  case 97: 
+                    (*psd) [i] = 0.116 * basePsdWattsHz;
+                    break;
+                  case 4: 
+                  case 96: 
+                    (*psd) [i] = 0.309 * basePsdWattsHz;
+                    break;
+                  case 5: 
+                    (*psd) [i] = (0.502 * basePsdWattsHz) + (21.577 * basePsdWattsHz); //pilot
+                    break;
+                  case 6: 
+                  case 94: 
+                    (*psd) [i] = 0.696 * basePsdWattsHz;
+                    break;
+                  case 7: 
+                  case 93: 
+                    (*psd) [i] = 0.913 * basePsdWattsHz;
+                    break;
+                  case 8: 
+                  case 92: 
+                    (*psd) [i] = 0.978 * basePsdWattsHz;
+                    break;
+                  case 9:
+                  case 91:  
+                    (*psd) [i] = 0.990 * basePsdWattsHz;
+                    break;
+                  case 95: 
+                    (*psd) [i] = 0.502 * basePsdWattsHz;
+                    break;
+                  default: 
+                    (*psd) [i] = basePsdWattsHz;
+                    break;
+                }  
+            }
+          break;
+        }
+      case TVTYPE_COFDM:
+        {
+          for (int i = 0; i <= 100; i++)
+            {
+              switch (i)
+                {
+                  case 0: 
+                  case 100: 
+                    (*psd) [i] = 1.52e-4 * basePsdWattsHz;
+                    break;
+                  case 1: 
+                  case 99: 
+                    (*psd) [i] = 2.93e-4 * basePsdWattsHz;
+                    break;
+                  case 2: 
+                  case 98: 
+                    (*psd) [i] = 8.26e-4 * basePsdWattsHz;
+                    break;
+                  case 3:
+                  case 97:  
+                    (*psd) [i] = 0.0927 * basePsdWattsHz;
+                    break;
+                  default: 
+                    (*psd) [i] = basePsdWattsHz;
+                    break;
+                }
+            }
+          break;
+        }
+      case TVTYPE_ANALOG:
+        {
+          for (int i = 0; i <= 100; i++)
+            {
+              switch (i)
+                {
+                  case 0:
+                  case 1:
+                  case 2:
+                  case 3:
+                    (*psd) [i] = 27.07946e-08 * basePsdWattsHz;
+                    break;
+                  case 4:
+                  case 5:
+                  case 6:
+                    (*psd) [i] = 2.51189e-07 * basePsdWattsHz;
+                    break;
+                  case 7:
+                  case 8:
+                  case 9:
+                    (*psd) [i] = 1e-06 * basePsdWattsHz;
+                    break;
+                  case 10:
+                  case 11:
+                  case 12:
+                    (*psd) [i] = 2.39883e-06 * basePsdWattsHz;
+                    break;
+                  case 13:
+                  case 14:
+                  case 15:
+                    (*psd) [i] = 5.62341e-06 * basePsdWattsHz;
+                    break;
+                  case 16:
+                  case 17:
+                  case 18:
+                    (*psd) [i] = 6.68344e-06 * basePsdWattsHz;
+                    break;
+                  case 19:
+                  case 20:
+                  case 21:
+                    (*psd) [i] = 1.25893e-05 * basePsdWattsHz;
+                    break;
+                  case 22:
+                  case 23:
+                  case 24:
+                    (*psd) [i] = 3.16228e-05 * basePsdWattsHz;
+                    break;
+                  case 25:
+                    (*psd) [i] = 0.000158489 * basePsdWattsHz;
+                    break;
+                  case 26:
+                    (*psd) [i] = basePsdWattsHz;
+                    break;
+                  case 27:
+                    (*psd) [i] = 7.49894e-05 * basePsdWattsHz;
+                    break;
+                  case 28:
+                  case 29:
+                  case 30:
+                    (*psd) [i] = 2.37137e-05 * basePsdWattsHz;
+                    break;
+                  case 31:
+                  case 32:
+                  case 33:
+                    (*psd) [i] = 1.14815e-05 * basePsdWattsHz;
+                    break;
+                  case 34:
+                  case 35:
+                  case 36:
+                    (*psd) [i] = 7.49894e-06 * basePsdWattsHz;
+                    break;
+                  case 37:
+                  case 38:
+                  case 39:
+                    (*psd) [i] = 5.62341e-06 * basePsdWattsHz;
+                    break;
+                  case 40:
+                  case 41:
+                  case 42:
+                    (*psd) [i] = 4.21697e-06 * basePsdWattsHz;
+                    break;
+                  case 43:
+                  case 44:
+                  case 45:
+                    (*psd) [i] = 3.16228e-06 * basePsdWattsHz;
+                    break;
+                  case 46:
+                  case 47:
+                  case 48:
+                    (*psd) [i] = 1.99526e-06 * basePsdWattsHz;
+                    break;
+                  case 49:
+                  case 50:
+                  case 51:
+                    (*psd) [i] = 1.25893e-06 * basePsdWattsHz;
+                    break;
+                  case 52:
+                  case 53:
+                  case 54:
+                    (*psd) [i] = 8.41395e-07 * basePsdWattsHz;
+                    break;
+                  case 55:
+                  case 56:
+                  case 57:
+                    (*psd) [i] = 6.30957e-07 * basePsdWattsHz;
+                    break;
+                  case 58:
+                  case 59:
+                  case 60:
+                    (*psd) [i] = 5.88844e-07 * basePsdWattsHz;
+                    break;
+                  case 61:
+                  case 62:
+                  case 63:
+                    (*psd) [i] = 5.62341e-07 * basePsdWattsHz;
+                    break;
+                  case 64:
+                  case 65:
+                  case 66:
+                    (*psd) [i] = 5.30884e-07 * basePsdWattsHz;
+                    break;
+                  case 67:
+                  case 68:
+                  case 69:
+                    (*psd) [i] = 5.01187e-07 * basePsdWattsHz;
+                    break;
+                  case 70:
+                  case 71:
+                  case 72:
+                    (*psd) [i] = 5.30884e-07 * basePsdWattsHz;
+                    break;
+                  case 73:
+                  case 74:
+                  case 75:
+                    (*psd) [i] = 7.49894e-07 * basePsdWattsHz;
+                    break;
+                  case 76:
+                  case 77:
+                  case 78:
+                    (*psd) [i] = 1.77828e-06 * basePsdWattsHz;
+                    break;
+                  case 79:
+                    (*psd) [i] = 5.62341e-06 * basePsdWattsHz;
+                    break;
+                  case 80:
+                    (*psd) [i] = 0.000177828 * basePsdWattsHz;
+                    break;
+                  case 81:
+                    (*psd) [i] = 4.21697e-06 * basePsdWattsHz;
+                    break;
+                  case 82:
+                  case 83:
+                  case 84:
+                    (*psd) [i] = 3.16228e-06 * basePsdWattsHz;
+                    break;
+                  case 85:
+                  case 86:
+                  case 87:
+                    (*psd) [i] = 3.16228e-06 * basePsdWattsHz;
+                    break;
+                  case 88:
+                  case 89:
+                  case 90:
+                    (*psd) [i] = 4.73151e-06 * basePsdWattsHz;
+                    break;
+                  case 91:
+                  case 92:
+                  case 93:
+                    (*psd) [i] = 7.49894e-06 * basePsdWattsHz;
+                    break;
+                  case 94:
+                    (*psd) [i] = 7.49894e-05 * basePsdWattsHz;
+                    break;
+                  case 95:
+                    (*psd) [i] = 0.1 * basePsdWattsHz;
+                    break;
+                  case 96:
+                    (*psd) [i] = 7.49894e-05 * basePsdWattsHz;
+                    break;
+                  case 97:
+                  case 98:
+                  case 99:
+                  case 100:
+                    (*psd) [i] = 1.77828e-06 * basePsdWattsHz;
+                    break;
+                }
+            }
+          break;
+        }
+      default:
+        {
+          NS_LOG_ERROR ("no valid TvType selected");
+          break;
+        }
+    }
+  m_txPsd = psd;
+}
+
+Ptr<SpectrumValue>
+TvSpectrumTransmitter::GetTxPsd () const
+{
+  NS_LOG_FUNCTION (this);
+  return m_txPsd;
+}
+
+void
+TvSpectrumTransmitter::SetupTx ()
+{
+  NS_LOG_FUNCTION (this);
+  NS_ASSERT (m_txPsd);
+  Ptr<SpectrumSignalParameters> signal = Create<SpectrumSignalParameters> ();
+  signal->duration = m_transmitDuration;
+  signal->psd = m_txPsd;
+  signal->txPhy = GetObject<SpectrumPhy> ();
+  signal->txAntenna = m_antenna;
+  m_channel->StartTx (signal);
+}
+
+void
+TvSpectrumTransmitter::Start ()
+{
+  NS_LOG_FUNCTION (this);
+  if (!m_active)
+    {
+      NS_LOG_LOGIC ("starting TV transmitter");
+      m_active = true;
+      Simulator::Schedule (m_startingTime, &TvSpectrumTransmitter::SetupTx, this);
+    }
+}
+
+void
+TvSpectrumTransmitter::Stop ()
+{
+  NS_LOG_FUNCTION (this);
+  m_active = false;
+}
+
+} // namespace ns3
+
diff -Naur ns-3.22/src/spectrum/model/tv-spectrum-transmitter.h ns-3.23/src/spectrum/model/tv-spectrum-transmitter.h
--- ns-3.22/src/spectrum/model/tv-spectrum-transmitter.h	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/model/tv-spectrum-transmitter.h	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,152 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#ifndef TV_SPECTRUM_TRANSMITTER_H
+#define TV_SPECTRUM_TRANSMITTER_H
+
+#include <ns3/spectrum-value.h>
+#include <ns3/spectrum-phy.h>
+#include <ns3/spectrum-channel.h>
+#include <ns3/antenna-model.h>
+#include <ns3/spectrum-signal-parameters.h>
+#include <ns3/mobility-model.h>
+#include <ns3/net-device.h>
+
+namespace ns3
+{
+
+
+/**
+ * \ingroup spectrum
+ *
+ * SpectrumPhy implementation that creates a customizable TV transmitter which
+ * transmits a PSD spectrum specified by user-set attributes.
+ *
+ *
+ * This PHY model supports a single antenna model instance which is
+ * used for transmission (this PHY model never receives).
+ */
+class TvSpectrumTransmitter : public SpectrumPhy
+{
+
+public:
+  /** 
+   * types of TV transmitters: analog, digital 8-VSB, or digital COFDM
+   */
+  enum TvType
+  {
+    TVTYPE_ANALOG,
+    TVTYPE_8VSB,
+    TVTYPE_COFDM
+  };
+  
+  TvSpectrumTransmitter (); //!< Default constructor
+  virtual ~TvSpectrumTransmitter (); //!< Destructor
+  
+  /**
+   * Register this type.
+   * \return The object TypeId.
+   */
+  static TypeId GetTypeId (void);
+
+  // inherited from SpectrumPhy
+  void SetChannel (Ptr<SpectrumChannel> c);
+  void SetMobility (Ptr<MobilityModel> m);
+  void SetDevice (Ptr<NetDevice> d);
+  Ptr<MobilityModel> GetMobility ();
+  Ptr<NetDevice> GetDevice ();
+  // device does not use Rx but these pure virtual methods must be implemented
+  Ptr<const SpectrumModel> GetRxSpectrumModel () const;
+  Ptr<AntennaModel> GetRxAntenna ();
+  void StartRx (Ptr<SpectrumSignalParameters> params);
+
+  /** 
+   * Get the spectrum channel
+   * 
+   * @return a pointer to the assigned spectrum channel
+   */
+  Ptr<SpectrumChannel> GetChannel () const;
+
+  /** 
+   * Creates power spectral density (PSD) spectrum of the TV transmitter and
+   * sets it for transmission.
+   * Before calling this method, must set attributes and parameters that are 
+   * applicable to your transmitter.
+   * 
+   * 8-VSB PSD approximated from Figure 3 of the following article:
+   * Baron, Stanley. "First-Hand:Digital Television: The Digital Terrestrial 
+   * Television Broadcasting (DTTB) Standard." IEEE Global History Network.
+   * <http://www.ieeeghn.org/wiki/index.php/First-Hand:Digital_Television:_The_
+   * Digital_Terrestrial_Television_Broadcasting_(DTTB)_Standard>.
+   *
+   * COFDM PSD approximated from Figure 12 (8k mode) of the following article:
+   * Kopp, Carlo. "High Definition Television." High Definition Television. Air 
+   * Power Australia. <http://www.ausairpower.net/AC-1100.html>.
+   *
+   * Analog PSD approximated from Figure 4 of the following paper:
+   * Stephen Shellhammer, Ahmed Sadek, and Wenyi Zhang. "Technical Challenges 
+   * for Cognitive Radio in the TV White Space Spectrum." Qualcomm Incorporated.
+   *
+   *
+   * @return a pointer to the power spectral density of the TV transmitter
+   */
+  virtual void CreateTvPsd ();
+
+  /** 
+   * Get the power spectral density of the TV transmitter's signal
+   * 
+   * @return a pointer to the PSD
+   */  
+  Ptr<SpectrumValue> GetTxPsd () const;
+
+  /** 
+   * Starts the TV Transmitter's transmission on the spectrum channel
+   */
+  virtual void Start ();
+
+  /** 
+   * Stops the TV Transmitter's transmission on the spectrum channel
+   */
+  virtual void Stop ();
+
+
+private:
+  Ptr<MobilityModel> m_mobility; //!< Pointer to mobility model object
+  Ptr<AntennaModel> m_antenna; //!< Pointer to antenna model object
+  Ptr<NetDevice> m_netDevice; //!< Pointer to net device object
+  Ptr<SpectrumChannel> m_channel; //!< Pointer to spectrum channel object
+
+  /** Sets up signal to be transmitted */
+  virtual void SetupTx ();
+
+  enum TvType m_tvType; //!< Type of TV transmitter
+  double m_startFrequency; //!< Start frequency (in Hz) of TV transmitter's signal
+  double m_channelBandwidth; //!< Bandwidth (in Hz) of TV transmitter's signal
+  double m_basePsd; //!< Base power spectral density value (in dBm/Hz) of TV transmitter's signal
+  Ptr<SpectrumValue> m_txPsd; //!< Pointer to power spectral density of TV transmitter's signal
+  Time m_startingTime; //!< Timepoint after simulation begins that TV transmitter will begin transmitting
+  Time m_transmitDuration; //!< Length of time that TV transmitter will transmit for
+  bool m_active; //!< True if TV transmitter is transmitting
+
+};
+
+} // namespace ns3
+
+#endif /* TV_SPECTRUM_TRANSMITTER_H */
diff -Naur ns-3.22/src/spectrum/model/waveform-generator.cc ns-3.23/src/spectrum/model/waveform-generator.cc
--- ns-3.22/src/spectrum/model/waveform-generator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/model/waveform-generator.cc	2015-05-13 11:05:26.000000000 -0700
@@ -69,6 +69,7 @@
 {
   static TypeId tid = TypeId ("ns3::WaveformGenerator")
     .SetParent<SpectrumPhy> ()
+    .SetGroupName ("Spectrum")
     .AddConstructor<WaveformGenerator> ()
     .AddAttribute ("Period",
                    "the period (=1/frequency)",
diff -Naur ns-3.22/src/spectrum/test/tv-helper-distribution-test.cc ns-3.23/src/spectrum/test/tv-helper-distribution-test.cc
--- ns-3.22/src/spectrum/test/tv-helper-distribution-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/test/tv-helper-distribution-test.cc	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,142 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#define private public //to make private method testable
+
+#include <ns3/test.h>
+#include <ns3/log.h>
+#include <ns3/tv-spectrum-transmitter-helper.h>
+
+/**
+ * This test verifies the accuracy of the private GetRandomNumTransmitters()  
+ * method in the TvSpectrumTransmitterHelper class. The method generates a 
+ * random number corresponding to the number of TV transmitters to create based 
+ * on the given location density (low, medium, or high) and maximum possible 
+ * number of TV channels. Low density will generate a transmitter for between 
+ * one (a single transmitter) and one third of the number of possible channels, 
+ * medium density will generate a transmitter for between one third and two 
+ * thirds, and high density will generate a transmitter for between two thirds 
+ * and all of the possible channels. In this test, it is verified that the 
+ * lower (1) and upper (max number of possible channels input) bounds are not 
+ * exceeded and that the number of transmitters to be generated does not overlap 
+ * between adjacent densities. For example, given 60 possible channels, for low 
+ * density between 1 and 20 transmitters can be created, for medium density 
+ * between 21 and 40 transmitters can be created, and for high density between 
+ * 41 and 60 transmitters can be created (all inclusive). This is tested with 
+ * various cases.
+ */
+NS_LOG_COMPONENT_DEFINE ("TvHelperDistributionTest");
+
+using namespace ns3;
+
+
+class TvHelperDistributionTestCase : public TestCase
+{
+public:
+  TvHelperDistributionTestCase (uint32_t maxNumTransmitters);
+  virtual ~TvHelperDistributionTestCase ();
+
+private:
+  virtual void DoRun (void);
+  static std::string Name (uint32_t maxNumTransmitters);
+  uint32_t m_maxNumTransmitters;
+};
+
+std::string 
+TvHelperDistributionTestCase::Name (uint32_t maxNumTransmitters)
+{
+  std::ostringstream oss;
+  oss << "Max Number of Transmitters = " << maxNumTransmitters;
+  return oss.str();
+}
+
+TvHelperDistributionTestCase::TvHelperDistributionTestCase (uint32_t maxNumTransmitters)
+  : TestCase (Name (maxNumTransmitters)),
+    m_maxNumTransmitters (maxNumTransmitters)
+{
+}
+
+TvHelperDistributionTestCase::~TvHelperDistributionTestCase ()
+{
+}
+
+void
+TvHelperDistributionTestCase::DoRun (void)
+{  
+  NS_LOG_FUNCTION (m_maxNumTransmitters);
+  TvSpectrumTransmitterHelper tvTransHelper;
+  uint32_t rand;
+  uint32_t maxLow = 0;
+  uint32_t minMid = m_maxNumTransmitters;
+  uint32_t maxMid = 0;
+  uint32_t minHigh = m_maxNumTransmitters;
+  for (int i = 0; i < 30; i ++) 
+    {
+      rand = tvTransHelper.GetRandomNumTransmitters (TvSpectrumTransmitterHelper::DENSITY_LOW, m_maxNumTransmitters);
+      NS_TEST_ASSERT_MSG_GT (rand, 0, "lower bound exceeded");
+      if (rand > maxLow)
+        {
+          maxLow = rand;
+        }
+    }
+  for (int i = 0; i < 30; i ++) 
+    {
+      rand = tvTransHelper.GetRandomNumTransmitters (TvSpectrumTransmitterHelper::DENSITY_MEDIUM, m_maxNumTransmitters);
+      if (rand < minMid)
+        {
+          minMid = rand;
+        }
+      if (rand > maxMid)
+        {
+          maxMid = rand;
+        }
+    }
+  for (int i = 0; i < 30; i ++) 
+    {
+      rand = tvTransHelper.GetRandomNumTransmitters (TvSpectrumTransmitterHelper::DENSITY_HIGH, m_maxNumTransmitters);
+      NS_TEST_ASSERT_MSG_LT (rand, m_maxNumTransmitters + 1, "upper bound exceeded");
+      if (rand < minHigh)
+        {
+          minHigh = rand;
+        }
+    }
+  NS_TEST_ASSERT_MSG_LT (maxLow, minMid, "low density overlaps with medium density");
+  NS_TEST_ASSERT_MSG_LT (maxMid, minHigh, "medium density overlaps with high density");
+}
+
+
+class TvHelperDistributionTestSuite : public TestSuite
+{
+public:
+  TvHelperDistributionTestSuite ();
+};
+
+TvHelperDistributionTestSuite::TvHelperDistributionTestSuite ()
+  : TestSuite ("tv-helper-distribution", UNIT)
+{
+  NS_LOG_INFO ("creating TvHelperDistributionTestSuite");
+  for (uint32_t maxNumTransmitters = 3; maxNumTransmitters <= 203; maxNumTransmitters+= 10)
+    {
+      AddTestCase (new TvHelperDistributionTestCase (maxNumTransmitters), 
+                   TestCase::QUICK);
+    }
+}
+
+static TvHelperDistributionTestSuite g_TvHelperDistributionTestSuite;
diff -Naur ns-3.22/src/spectrum/test/tv-spectrum-transmitter-test.cc ns-3.23/src/spectrum/test/tv-spectrum-transmitter-test.cc
--- ns-3.22/src/spectrum/test/tv-spectrum-transmitter-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/spectrum/test/tv-spectrum-transmitter-test.cc	2015-05-13 11:05:26.000000000 -0700
@@ -0,0 +1,211 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014 University of Washington
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Benjamin Cizdziel <ben.cizdziel@gmail.com>
+ */
+
+#include <ns3/test.h>
+#include <ns3/log.h>
+#include <ns3/spectrum-value.h>
+#include <ns3/enum.h>
+#include <ns3/double.h>
+#include <ns3/tv-spectrum-transmitter.h>
+
+/**
+ * This test verifies the accuracy of the spectrum/PSD model in the 
+ * TvSpectrumTransmitter class. To do so, it tests if the max power spectral 
+ * density, start frequency, and end frequency comply with expected values. 
+ * Values for TV/modulation type, start frequency, channel bandwidth, and 
+ * base PSD are swept and tested for each case.
+ */
+NS_LOG_COMPONENT_DEFINE ("TvSpectrumTransmitterTest");
+
+using namespace ns3;
+
+const double TOLERANCE = 1e-15;
+// Bug 2094: Adjust floating point comparison epsilon based on inputs.
+//           Follows http://realtimecollisiondetection.net/blog/?p=89
+double epsilon;
+
+class TvSpectrumTransmitterTestCase : public TestCase
+{
+public:
+  TvSpectrumTransmitterTestCase (double startFrequency, 
+                            double channelBandwidth, 
+                            double basePsd, 
+                            TvSpectrumTransmitter::TvType tvType);
+  virtual ~TvSpectrumTransmitterTestCase ();
+
+private:
+  virtual void DoRun (void);
+  static std::string Name (TvSpectrumTransmitter::TvType tvType, 
+                           double startFrequency, 
+                           double channelBandwidth, 
+                           double basePsd);
+
+  double m_startFrequency;
+  double m_channelBandwidth; 
+  double m_basePsd;
+  TvSpectrumTransmitter::TvType m_tvType;
+};
+
+
+std::string 
+TvSpectrumTransmitterTestCase::Name (TvSpectrumTransmitter::TvType tvType, 
+                                     double startFrequency, 
+                                     double channelBandwidth, 
+                                     double basePsd)
+{
+  std::ostringstream oss;
+  oss << "TV type = " << tvType << ", "
+      << "start frequency = " << startFrequency << " Hz, "
+      << "channel bandwidth = " << channelBandwidth << " Hz, "
+      << "base PSD = " << basePsd << " dBm per Hz";
+  return oss.str();
+}
+
+TvSpectrumTransmitterTestCase::TvSpectrumTransmitterTestCase (double startFrequency,
+						    double channelBandwidth,
+						    double basePsd,
+						    TvSpectrumTransmitter::TvType tvType)
+  : TestCase (Name (tvType, startFrequency, channelBandwidth, basePsd)),
+    m_startFrequency (startFrequency),
+    m_channelBandwidth (channelBandwidth),
+    m_basePsd (basePsd),
+    m_tvType (tvType)
+{
+}
+
+TvSpectrumTransmitterTestCase::~TvSpectrumTransmitterTestCase ()
+{
+}
+
+void
+TvSpectrumTransmitterTestCase::DoRun (void)
+{  
+  NS_LOG_FUNCTION (m_startFrequency << m_basePsd << m_tvType);
+
+  /* TV transmitter setup */
+  Ptr<TvSpectrumTransmitter> phy = CreateObject<TvSpectrumTransmitter>();
+  phy->SetAttribute ("StartFrequency", DoubleValue (m_startFrequency));
+  phy->SetAttribute ("ChannelBandwidth", DoubleValue (m_channelBandwidth));
+  phy->SetAttribute ("BasePsd", DoubleValue (m_basePsd)); 
+  phy->SetAttribute ("TvType", EnumValue (m_tvType));
+  phy->CreateTvPsd ();
+
+  /* Test max PSD value */
+  Ptr<SpectrumValue> psd = phy->GetTxPsd ();
+  Values::const_iterator psdIter = psd->ConstValuesBegin ();
+  double maxValue = 0;
+  while (psdIter != psd->ConstValuesEnd ())
+    {
+      if (*psdIter > maxValue)
+        {
+          maxValue = *psdIter;
+        }
+      ++psdIter;
+    }
+  double basePsdWattsHz = pow (10.0, (m_basePsd - 30) / 10.0); // convert dBm to W/Hz
+  if (m_tvType == TvSpectrumTransmitter::TVTYPE_8VSB) // pilot has highest PSD
+    {
+      double expectedPsd = (0.502 * basePsdWattsHz) + (21.577 * basePsdWattsHz);
+      epsilon = TOLERANCE * std::max (1.0, std::max (maxValue, expectedPsd));
+      NS_TEST_ASSERT_MSG_EQ_TOL (maxValue, 
+                                 expectedPsd, 
+                                 epsilon,
+                                 "peak PSD value (" << maxValue << ") is incorrect");
+    }
+  else // highest PSD is base PSD
+    {
+      epsilon = TOLERANCE * std::max (1.0, std::max (maxValue, basePsdWattsHz));
+      NS_TEST_ASSERT_MSG_EQ_TOL (maxValue, 
+                                 basePsdWattsHz, 
+                                 epsilon, 
+                                 "peak PSD value (" << maxValue << ") is incorrect");
+    }
+
+  /* Test frequency range */
+  Bands::const_iterator bandStart = psd->ConstBandsBegin ();
+  Bands::const_iterator bandEnd = psd->ConstBandsEnd ();
+  epsilon = TOLERANCE * std::max (1.0, std::max ((*bandStart).fc, m_startFrequency));
+  NS_TEST_ASSERT_MSG_EQ_TOL ((*bandStart).fc, 
+                             m_startFrequency, 
+                             epsilon, 
+                             "start frequency value (" << (*bandStart).fc << ") is incorrect");
+  epsilon = TOLERANCE * std::max (1.0, std::max ((*bandStart).fc, (m_startFrequency + m_channelBandwidth)));
+  NS_TEST_ASSERT_MSG_EQ_TOL ((*(bandEnd - 1)).fc, 
+                             m_startFrequency + m_channelBandwidth, 
+                             epsilon, 
+                             "end frequency value (" << (*(bandEnd - 1)).fc << ") is incorrect");
+}
+
+
+class TvSpectrumTransmitterTestSuite : public TestSuite
+{
+public:
+  TvSpectrumTransmitterTestSuite ();
+};
+
+TvSpectrumTransmitterTestSuite::TvSpectrumTransmitterTestSuite ()
+  : TestSuite ("tv-spectrum-transmitter", UNIT)
+{
+  NS_LOG_INFO ("creating TvSpectrumTransmitterTestSuite");
+  for (double startFreq = 100; startFreq < 1e15; startFreq *= 10)
+    {
+      for (double bandwidth = 100; bandwidth < 1e15; bandwidth *= 10)
+        {
+          for (double psd = -100; psd <= 100; psd += 20)
+            {
+              AddTestCase (new TvSpectrumTransmitterTestCase (startFreq, 
+                                                              bandwidth, 
+                                                              psd, 
+                                                              TvSpectrumTransmitter::TVTYPE_8VSB), 
+                           TestCase::QUICK);
+            }
+        }
+    }
+  for (double startFreq = 100; startFreq < 1e15; startFreq *= 10)
+    {
+      for (double bandwidth = 100; bandwidth < 1e15; bandwidth *= 10)
+        {
+          for (double psd = -100; psd <= 100; psd += 20)
+            {
+              AddTestCase (new TvSpectrumTransmitterTestCase (startFreq, 
+                                                              bandwidth, 
+                                                              psd, 
+                                                              TvSpectrumTransmitter::TVTYPE_COFDM), 
+                           TestCase::QUICK);
+            }
+        }
+    }
+  for (double startFreq = 100; startFreq < 1e15; startFreq *= 10)
+    {
+      for (double bandwidth = 100; bandwidth < 1e15; bandwidth *= 10)
+        {
+          for (double psd = -100; psd <= 100; psd += 20)
+            {
+              AddTestCase (new TvSpectrumTransmitterTestCase (startFreq, 
+                                                              bandwidth, 
+                                                              psd, 
+                                                              TvSpectrumTransmitter::TVTYPE_ANALOG), 
+                           TestCase::QUICK);
+            }
+        }
+    }
+}
+
+static TvSpectrumTransmitterTestSuite g_tvSpectrumTransmitterTestSuite;
diff -Naur ns-3.22/src/spectrum/wscript ns-3.23/src/spectrum/wscript
--- ns-3.22/src/spectrum/wscript	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/spectrum/wscript	2015-05-13 11:05:26.000000000 -0700
@@ -28,10 +28,12 @@
         'model/half-duplex-ideal-phy-signal-parameters.cc',
         'model/non-communicating-net-device.cc',
         'model/microwave-oven-spectrum-value-helper.cc',
+        'model/tv-spectrum-transmitter.cc',
         'helper/spectrum-helper.cc',
         'helper/adhoc-aloha-noack-ideal-phy-helper.cc',
         'helper/waveform-generator-helper.cc',
         'helper/spectrum-analyzer-helper.cc',
+        'helper/tv-spectrum-transmitter-helper.cc',
         ]
 
     module_test = bld.create_ns3_module_test_library('spectrum')
@@ -40,6 +42,8 @@
         'test/spectrum-value-test.cc',
         'test/spectrum-ideal-phy-test.cc',
         'test/spectrum-waveform-generator-test.cc',
+        'test/tv-helper-distribution-test.cc',
+        'test/tv-spectrum-transmitter-test.cc',
         ]
     
     headers = bld(features='ns3header')
@@ -69,10 +73,12 @@
         'model/half-duplex-ideal-phy-signal-parameters.h',
         'model/non-communicating-net-device.h',
         'model/microwave-oven-spectrum-value-helper.h',
+        'model/tv-spectrum-transmitter.h',
         'helper/spectrum-helper.h',
         'helper/adhoc-aloha-noack-ideal-phy-helper.h',
         'helper/waveform-generator-helper.h',
         'helper/spectrum-analyzer-helper.h',
+        'helper/tv-spectrum-transmitter-helper.h',
         'test/spectrum-test.h',
         ]
 
diff -Naur ns-3.22/src/stats/model/boolean-probe.cc ns-3.23/src/stats/model/boolean-probe.cc
--- ns-3.22/src/stats/model/boolean-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/boolean-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::BooleanProbe")
     .SetParent<Probe> ()
+    .SetGroupName ("Stats")
     .AddConstructor<BooleanProbe> ()
     .AddTraceSource ( "Output",
                       "The bool that serves as output for this probe",
diff -Naur ns-3.22/src/stats/model/data-collection-object.cc ns-3.23/src/stats/model/data-collection-object.cc
--- ns-3.22/src/stats/model/data-collection-object.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/data-collection-object.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::DataCollectionObject")
     .SetParent<Object> ()
+    .SetGroupName ("Stats")
     .AddConstructor<DataCollectionObject> ()
     .AddAttribute ( "Name",
                     "Object's name",
diff -Naur ns-3.22/src/stats/model/double-probe.cc ns-3.23/src/stats/model/double-probe.cc
--- ns-3.22/src/stats/model/double-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/double-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::DoubleProbe")
     .SetParent<Probe> ()
+    .SetGroupName ("Stats")
     .AddConstructor<DoubleProbe> ()
     .AddTraceSource ( "Output",
                       "The double that serves as output for this probe",
diff -Naur ns-3.22/src/stats/model/file-aggregator.cc ns-3.23/src/stats/model/file-aggregator.cc
--- ns-3.22/src/stats/model/file-aggregator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/file-aggregator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::FileAggregator")
     .SetParent<DataCollectionObject> ()
+    .SetGroupName ("Stats")
   ;
 
   return tid;
diff -Naur ns-3.22/src/stats/model/gnuplot-aggregator.cc ns-3.23/src/stats/model/gnuplot-aggregator.cc
--- ns-3.22/src/stats/model/gnuplot-aggregator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/gnuplot-aggregator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::GnuplotAggregator")
     .SetParent<DataCollectionObject> ()
+    .SetGroupName ("Stats")
   ;
 
   return tid;
diff -Naur ns-3.22/src/stats/model/probe.cc ns-3.23/src/stats/model/probe.cc
--- ns-3.22/src/stats/model/probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::Probe")
     .SetParent<DataCollectionObject> ()
+    .SetGroupName ("Stats")
     .AddAttribute ("Start",
                    "Time data collection starts",
                    TimeValue (Seconds (0)),
diff -Naur ns-3.22/src/stats/model/time-probe.cc ns-3.23/src/stats/model/time-probe.cc
--- ns-3.22/src/stats/model/time-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/time-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::TimeProbe")
     .SetParent<Probe> ()
+    .SetGroupName ("Stats")
     .AddConstructor<TimeProbe> ()
     .AddTraceSource ("Output",
                      "The double valued (units of seconds) probe output",
diff -Naur ns-3.22/src/stats/model/time-series-adaptor.cc ns-3.23/src/stats/model/time-series-adaptor.cc
--- ns-3.22/src/stats/model/time-series-adaptor.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/time-series-adaptor.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::TimeSeriesAdaptor")
     .SetParent<DataCollectionObject> ()
+    .SetGroupName ("Stats")
     .AddConstructor<TimeSeriesAdaptor> ()
     .AddTraceSource ( "Output",
                       "The current simulation time versus "
diff -Naur ns-3.22/src/stats/model/uinteger-16-probe.cc ns-3.23/src/stats/model/uinteger-16-probe.cc
--- ns-3.22/src/stats/model/uinteger-16-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/uinteger-16-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::Uinteger16Probe")
     .SetParent<Probe> ()
+    .SetGroupName ("Stats")
     .AddConstructor<Uinteger16Probe> ()
     .AddTraceSource ( "Output",
                       "The uint16_t that serves as output for this probe",
diff -Naur ns-3.22/src/stats/model/uinteger-32-probe.cc ns-3.23/src/stats/model/uinteger-32-probe.cc
--- ns-3.22/src/stats/model/uinteger-32-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/uinteger-32-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::Uinteger32Probe")
     .SetParent<Probe> ()
+    .SetGroupName ("Stats")
     .AddConstructor<Uinteger32Probe> ()
     .AddTraceSource ( "Output",
                       "The uint32_t that serves as output for this probe",
diff -Naur ns-3.22/src/stats/model/uinteger-8-probe.cc ns-3.23/src/stats/model/uinteger-8-probe.cc
--- ns-3.22/src/stats/model/uinteger-8-probe.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/model/uinteger-8-probe.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::Uinteger8Probe")
     .SetParent<Probe> ()
+    .SetGroupName ("Stats")
     .AddConstructor<Uinteger8Probe> ()
     .AddTraceSource ( "Output",
                       "The uint8_t that serves as output for this probe",
diff -Naur ns-3.22/src/stats/test/double-probe-test-suite.cc ns-3.23/src/stats/test/double-probe-test-suite.cc
--- ns-3.22/src/stats/test/double-probe-test-suite.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/stats/test/double-probe-test-suite.cc	2015-05-13 11:05:27.000000000 -0700
@@ -56,7 +56,6 @@
   double aux;
 };
 
-Ptr<SampleEmitter> s = CreateObject<SampleEmitter> ();
 
 TypeId
 SampleEmitter::GetTypeId (void)
@@ -81,6 +80,7 @@
   void TraceSink (std::string context, double oldValue, double newValue);
   uint32_t m_objectProbed;
   uint32_t m_pathProbed;
+  Ptr<SampleEmitter> m_s;
 };
 
 ProbeTestCase1::ProbeTestCase1 ()
@@ -100,7 +100,7 @@
   NS_TEST_ASSERT_MSG_GT (Simulator::Now (), Seconds (100), "Probed a value outside of the time window");
   NS_TEST_ASSERT_MSG_LT (Simulator::Now (), Seconds (200), "Probed a value outside of the time window");
 
-  NS_TEST_ASSERT_MSG_EQ_TOL (s->GetValue (), newValue, 0.00001, "Value probed different than value in the variable");
+  NS_TEST_ASSERT_MSG_EQ_TOL (m_s->GetValue (), newValue, 0.00001, "Value probed different than value in the variable");
 
   if (context == "testProbe")
     {
@@ -115,23 +115,25 @@
 void
 ProbeTestCase1::DoRun (void)
 {
+  // Defer creation of this until here because it is a random variable
+  m_s = CreateObject<SampleEmitter> ();
   // Test that all instances of probe data are between time window specified
   // Check also that probes can be hooked to sources by Object and by path
 
   Ptr<DoubleProbe> p = CreateObject<DoubleProbe> ();
   p->SetName ("testProbe");
 
-  Simulator::Schedule (Seconds (1), &SampleEmitter::Start, s);
+  Simulator::Schedule (Seconds (1), &SampleEmitter::Start, m_s);
   p->SetAttribute ("Start", TimeValue (Seconds (100.0)));
   p->SetAttribute ("Stop", TimeValue (Seconds (200.0)));
   Simulator::Stop (Seconds (300));
 
   // Register our emitter object so we can fetch it by using the Config
   // namespace
-  Names::Add ("/Names/SampleEmitter", s);
+  Names::Add ("/Names/SampleEmitter", m_s);
 
   // Hook probe to the emitter.
-  p->ConnectByObject ("Emitter", s);
+  p->ConnectByObject ("Emitter", m_s);
 
   // Hook our test function to the probe trace source
   p->TraceConnect ("Output", p->GetName (), MakeCallback (&ProbeTestCase1::TraceSink, this));
diff -Naur ns-3.22/src/tap-bridge/bindings/modulegen__gcc_ILP32.py ns-3.23/src/tap-bridge/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/tap-bridge/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/tap-bridge/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -880,11 +880,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/tap-bridge/bindings/modulegen__gcc_LP64.py ns-3.23/src/tap-bridge/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/tap-bridge/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/tap-bridge/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -880,11 +880,21 @@
     cls.add_constructor([param('uint64_t', 'bps')])
     ## data-rate.h (module 'network'): ns3::DataRate::DataRate(std::string rate) [constructor]
     cls.add_constructor([param('std::string', 'rate')])
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBitsTxTime(uint32_t bits) const [member function]
+    cls.add_method('CalculateBitsTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bits')], 
+                   is_const=True)
+    ## data-rate.h (module 'network'): ns3::Time ns3::DataRate::CalculateBytesTxTime(uint32_t bytes) const [member function]
+    cls.add_method('CalculateBytesTxTime', 
+                   'ns3::Time', 
+                   [param('uint32_t', 'bytes')], 
+                   is_const=True)
     ## data-rate.h (module 'network'): double ns3::DataRate::CalculateTxTime(uint32_t bytes) const [member function]
     cls.add_method('CalculateTxTime', 
                    'double', 
                    [param('uint32_t', 'bytes')], 
-                   is_const=True)
+                   deprecated=True, is_const=True)
     ## data-rate.h (module 'network'): uint64_t ns3::DataRate::GetBitRate() const [member function]
     cls.add_method('GetBitRate', 
                    'uint64_t', 
diff -Naur ns-3.22/src/tap-bridge/model/tap-bridge.cc ns-3.23/src/tap-bridge/model/tap-bridge.cc
--- ns-3.22/src/tap-bridge/model/tap-bridge.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/tap-bridge/model/tap-bridge.cc	2015-05-13 11:05:27.000000000 -0700
@@ -80,6 +80,7 @@
 {
   static TypeId tid = TypeId ("ns3::TapBridge")
     .SetParent<NetDevice> ()
+    .SetGroupName ("TapBridge")
     .AddConstructor<TapBridge> ()
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (0),
diff -Naur ns-3.22/src/test/ns3tcp/ns3tcp-state-test-suite.cc ns-3.23/src/test/ns3tcp/ns3tcp-state-test-suite.cc
--- ns-3.22/src/test/ns3tcp/ns3tcp-state-test-suite.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/test/ns3tcp/ns3tcp-state-test-suite.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 #include "ns3/error-model.h"
 #include "ns3/pointer.h"
 #include "ns3tcp-socket-writer.h"
+#include "ns3/tcp-header.h"
 
 using namespace ns3;
 
@@ -149,6 +150,13 @@
   Ipv4Header ipHeader;
   p->RemoveHeader (ipHeader);
 
+  if (g_log.IsEnabled (ns3::LOG_DEBUG))
+    {
+      TcpHeader th;
+      p->PeekHeader (th);
+      std::clog << Simulator::Now ().GetSeconds () << " TCP header " << th << std::endl;
+    }
+
   //
   // What is left is the TCP header and any data that may be sent.  We aren't
   // sending any TCP data, so we expect what remains is only TCP header, which
diff -Naur ns-3.22/src/topology-read/model/inet-topology-reader.cc ns-3.23/src/topology-read/model/inet-topology-reader.cc
--- ns-3.22/src/topology-read/model/inet-topology-reader.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/topology-read/model/inet-topology-reader.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::InetTopologyReader")
     .SetParent<Object> ()
+    .SetGroupName ("TopologyReader")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/topology-read/model/orbis-topology-reader.cc ns-3.23/src/topology-read/model/orbis-topology-reader.cc
--- ns-3.22/src/topology-read/model/orbis-topology-reader.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/topology-read/model/orbis-topology-reader.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::OrbisTopologyReader")
     .SetParent<Object> ()
+    .SetGroupName ("TopologyReader")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/topology-read/model/rocketfuel-topology-reader.cc ns-3.23/src/topology-read/model/rocketfuel-topology-reader.cc
--- ns-3.22/src/topology-read/model/rocketfuel-topology-reader.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/topology-read/model/rocketfuel-topology-reader.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,6 +38,7 @@
 {
   static TypeId tid = TypeId ("ns3::RocketfuelTopologyReader")
     .SetParent<Object> ()
+    .SetGroupName ("TopologyReader")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/topology-read/model/topology-reader.cc ns-3.23/src/topology-read/model/topology-reader.cc
--- ns-3.22/src/topology-read/model/topology-reader.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/topology-read/model/topology-reader.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::TopologyReader")
     .SetParent<Object> ()
+    .SetGroupName ("TopologyReader")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/uan/model/uan-channel.cc ns-3.23/src/uan/model/uan-channel.cc
--- ns-3.22/src/uan/model/uan-channel.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanChannel")
     .SetParent<Channel> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanChannel> ()
     .AddAttribute ("PropagationModel",
                    "A pointer to the propagation model.",
diff -Naur ns-3.22/src/uan/model/uan-header-common.cc ns-3.23/src/uan/model/uan-header-common.cc
--- ns-3.22/src/uan/model/uan-header-common.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-header-common.cc	2015-05-13 11:05:27.000000000 -0700
@@ -43,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanHeaderCommon")
     .SetParent<Header> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanHeaderCommon> ()
   ;
   return tid;
diff -Naur ns-3.22/src/uan/model/uan-header-rc.cc ns-3.23/src/uan/model/uan-header-rc.cc
--- ns-3.22/src/uan/model/uan-header-rc.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-header-rc.cc	2015-05-13 11:05:27.000000000 -0700
@@ -55,6 +55,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanHeaderRcData")
     .SetParent<Header> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanHeaderRcData> ()
   ;
   return tid;
@@ -152,6 +153,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanHeaderRcRts")
     .SetParent<Header> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanHeaderRcRts> ()
   ;
   return tid;
@@ -289,6 +291,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanHeaderRcCtsGlobal")
     .SetParent<Header> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanHeaderRcCtsGlobal> ()
   ;
   return tid;
@@ -414,6 +417,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanHeaderRcCts")
     .SetParent<Header> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanHeaderRcCts> ()
   ;
   return tid;
@@ -537,6 +541,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanHeaderRcAck")
     .SetParent<Header> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanHeaderRcAck> ()
   ;
   return tid;
diff -Naur ns-3.22/src/uan/model/uan-mac-aloha.cc ns-3.23/src/uan/model/uan-mac-aloha.cc
--- ns-3.22/src/uan/model/uan-mac-aloha.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-mac-aloha.cc	2015-05-13 11:05:27.000000000 -0700
@@ -71,6 +71,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanMacAloha")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanMacAloha> ()
   ;
   return tid;
diff -Naur ns-3.22/src/uan/model/uan-mac.cc ns-3.23/src/uan/model/uan-mac.cc
--- ns-3.22/src/uan/model/uan-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -27,7 +27,9 @@
 TypeId UanMac::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::UanMac")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Uan")
+  ;
   return tid;
 }
 
diff -Naur ns-3.22/src/uan/model/uan-mac-cw.cc ns-3.23/src/uan/model/uan-mac-cw.cc
--- ns-3.22/src/uan/model/uan-mac-cw.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-mac-cw.cc	2015-05-13 11:05:27.000000000 -0700
@@ -78,6 +78,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanMacCw")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanMacCw> ()
     .AddAttribute ("CW",
                    "The MAC parameter CW.",
diff -Naur ns-3.22/src/uan/model/uan-mac-rc.cc ns-3.23/src/uan/model/uan-mac-rc.cc
--- ns-3.22/src/uan/model/uan-mac-rc.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-mac-rc.cc	2015-05-13 11:05:27.000000000 -0700
@@ -209,6 +209,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanMacRc")
     .SetParent<UanMac> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanMacRc> ()
     .AddAttribute ("RetryRate",
                    "Number of retry attempts per second (of RTS/GWPING).",
diff -Naur ns-3.22/src/uan/model/uan-mac-rc-gw.cc ns-3.23/src/uan/model/uan-mac-rc-gw.cc
--- ns-3.22/src/uan/model/uan-mac-rc-gw.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-mac-rc-gw.cc	2015-05-13 11:05:27.000000000 -0700
@@ -104,6 +104,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanMacRcGw")
     .SetParent<UanMac> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanMacRcGw> ()
     .AddAttribute ("MaxReservations",
                    "Maximum number of reservations to accept per cycle.",
diff -Naur ns-3.22/src/uan/model/uan-net-device.cc ns-3.23/src/uan/model/uan-net-device.cc
--- ns-3.22/src/uan/model/uan-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -88,10 +88,9 @@
 TypeId
 UanNetDevice::GetTypeId ()
 {
-
-
   static TypeId tid = TypeId ("ns3::UanNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Uan")
     .AddAttribute ("Channel", "The channel attached to this device.",
                    PointerValue (),
                    MakePointerAccessor (&UanNetDevice::DoGetChannel, &UanNetDevice::SetChannel),
diff -Naur ns-3.22/src/uan/model/uan-noise-model.cc ns-3.23/src/uan/model/uan-noise-model.cc
--- ns-3.22/src/uan/model/uan-noise-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-noise-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -27,7 +27,9 @@
 TypeId UanNoiseModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::UanNoiseModel")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Uan")
+  ;
   return tid;
 }
 
diff -Naur ns-3.22/src/uan/model/uan-noise-model-default.cc ns-3.23/src/uan/model/uan-noise-model-default.cc
--- ns-3.22/src/uan/model/uan-noise-model-default.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-noise-model-default.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanNoiseModelDefault")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanNoiseModelDefault> ()
     .AddAttribute ("Wind", "Wind speed in m/s.",
                    DoubleValue (1),
diff -Naur ns-3.22/src/uan/model/uan-phy.cc ns-3.23/src/uan/model/uan-phy.cc
--- ns-3.22/src/uan/model/uan-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-phy.cc	2015-05-13 11:05:27.000000000 -0700
@@ -27,7 +27,9 @@
 TypeId UanPhyCalcSinr::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::UanPhyCalcSinr")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Uan")
+  ;
   return tid;
 }
 
@@ -48,7 +50,9 @@
 TypeId UanPhyPer::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::UanPhyPer")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Uan")
+  ;
   return tid;
 }
 
@@ -70,6 +74,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanPhy")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddTraceSource ("PhyTxBegin",
                      "Trace source indicating a packet has "
                      "begun transmitting over the channel medium.",
diff -Naur ns-3.22/src/uan/model/uan-phy-dual.cc ns-3.23/src/uan/model/uan-phy-dual.cc
--- ns-3.22/src/uan/model/uan-phy-dual.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-phy-dual.cc	2015-05-13 11:05:27.000000000 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanPhyCalcSinrDual")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanPhyCalcSinrDual> ()
   ;
   return tid;
@@ -159,6 +160,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanPhyDual")
     .SetParent<UanPhy> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanPhyDual> ()
     .AddAttribute  ("CcaThresholdPhy1",
                     "Aggregate energy of incoming signals to move to CCA Busy state dB of Phy1.",
diff -Naur ns-3.22/src/uan/model/uan-phy-gen.cc ns-3.23/src/uan/model/uan-phy-gen.cc
--- ns-3.22/src/uan/model/uan-phy-gen.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-phy-gen.cc	2015-05-13 11:05:27.000000000 -0700
@@ -63,6 +63,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanPhyCalcSinrDefault")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanPhyCalcSinrDefault> ()
   ;
   return tid;
@@ -110,6 +111,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanPhyCalcSinrFhFsk")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanPhyCalcSinrFhFsk> ()
     .AddAttribute ("NumberOfHops",
                    "Number of frequencies in hopping pattern.",
@@ -216,6 +218,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanPhyPerGenDefault")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanPhyPerGenDefault> ()
     .AddAttribute ("Threshold", "SINR cutoff for good packet reception.",
                    DoubleValue (8),
@@ -254,6 +257,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanPhyPerUmodem")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanPhyPerUmodem> ()
   ;
   return tid;
@@ -431,6 +435,7 @@
 
   static TypeId tid = TypeId ("ns3::UanPhyGen")
     .SetParent<UanPhy> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanPhyGen> ()
     .AddAttribute ("CcaThreshold",
                    "Aggregate energy of incoming signals to move to CCA Busy state dB.",
diff -Naur ns-3.22/src/uan/model/uan-prop-model.cc ns-3.23/src/uan/model/uan-prop-model.cc
--- ns-3.22/src/uan/model/uan-prop-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-prop-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -341,7 +341,9 @@
 TypeId UanPropModel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::UanPropModel")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Uan")
+  ;
   return tid;
 }
 
diff -Naur ns-3.22/src/uan/model/uan-prop-model-ideal.cc ns-3.23/src/uan/model/uan-prop-model-ideal.cc
--- ns-3.22/src/uan/model/uan-prop-model-ideal.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-prop-model-ideal.cc	2015-05-13 11:05:27.000000000 -0700
@@ -39,6 +39,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanPropModelIdeal")
     .SetParent<UanPropModel> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanPropModelIdeal> ()
   ;
   return tid;
diff -Naur ns-3.22/src/uan/model/uan-prop-model-thorp.cc ns-3.23/src/uan/model/uan-prop-model-thorp.cc
--- ns-3.22/src/uan/model/uan-prop-model-thorp.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-prop-model-thorp.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanPropModelThorp")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanPropModelThorp> ()
     .AddAttribute ("SpreadCoef",
                    "Spreading coefficient used in calculation of Thorp's approximation.",
diff -Naur ns-3.22/src/uan/model/uan-transducer.cc ns-3.23/src/uan/model/uan-transducer.cc
--- ns-3.22/src/uan/model/uan-transducer.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-transducer.cc	2015-05-13 11:05:27.000000000 -0700
@@ -27,7 +27,9 @@
 TypeId UanTransducer::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::UanTransducer")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName ("Uan")
+  ;
   return tid;
 }
 
diff -Naur ns-3.22/src/uan/model/uan-transducer-hd.cc ns-3.23/src/uan/model/uan-transducer-hd.cc
--- ns-3.22/src/uan/model/uan-transducer-hd.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/uan/model/uan-transducer-hd.cc	2015-05-13 11:05:27.000000000 -0700
@@ -89,6 +89,7 @@
 {
   static TypeId tid = TypeId ("ns3::UanTransducerHd")
     .SetParent<Object> ()
+    .SetGroupName ("Uan")
     .AddConstructor<UanTransducerHd> ()
   ;
   return tid;
diff -Naur ns-3.22/src/virtual-net-device/model/virtual-net-device.cc ns-3.23/src/virtual-net-device/model/virtual-net-device.cc
--- ns-3.22/src/virtual-net-device/model/virtual-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/virtual-net-device/model/virtual-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::VirtualNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("VirtualNetDevice")
     .AddConstructor<VirtualNetDevice> ()
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (1500),
diff -Naur ns-3.22/src/visualizer/model/pyviz.cc ns-3.23/src/visualizer/model/pyviz.cc
--- ns-3.22/src/visualizer/model/pyviz.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/visualizer/model/pyviz.cc	2015-05-13 11:05:27.000000000 -0700
@@ -85,6 +85,7 @@
 {
   static TypeId tid = TypeId ("ns3::PyVizPacketTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Visualizer")
     .AddConstructor<PyVizPacketTag> ()
   ;
   return tid;
diff -Naur ns-3.22/src/visualizer/model/visual-simulator-impl.cc ns-3.23/src/visualizer/model/visual-simulator-impl.cc
--- ns-3.22/src/visualizer/model/visual-simulator-impl.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/visualizer/model/visual-simulator-impl.cc	2015-05-13 11:05:27.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::VisualSimulatorImpl")
     .SetParent<SimulatorImpl> ()
+    .SetGroupName ("Visualizer")
     .AddConstructor<VisualSimulatorImpl> ()
     .AddAttribute ("SimulatorImplFactory",
                    "Factory for the underlying simulator implementation used by the visualizer.",
diff -Naur ns-3.22/src/wave/bindings/modulegen__gcc_ILP32.py ns-3.23/src/wave/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/wave/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -128,8 +128,8 @@
     module.add_class('Mac48Address', import_from_module='ns.network')
     ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
     root_module['ns3::Mac48Address'].implicitly_converts_to(root_module['ns3::Address'])
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener [class]
-    module.add_class('MacLowBlockAckEventListener', allow_subclassing=True, import_from_module='ns.wifi')
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener [class]
+    module.add_class('MacLowAggregationCapableTransmissionListener', allow_subclassing=True, import_from_module='ns.wifi')
     ## mac-low.h (module 'wifi'): ns3::MacLowDcfListener [class]
     module.add_class('MacLowDcfListener', allow_subclassing=True, import_from_module='ns.wifi')
     ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener [class]
@@ -375,17 +375,13 @@
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader [class]
     module.add_class('WifiActionHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::CategoryValue [enumeration]
-    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH_PEERING_MGT', 'MESH_LINK_METRIC', 'MESH_PATH_SELECTION', 'MESH_INTERWORKING', 'MESH_RESOURCE_COORDINATION', 'MESH_PROXY_FORWARDING', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PeerLinkMgtActionValue [enumeration]
-    module.add_enum('PeerLinkMgtActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::LinkMetricActionValue [enumeration]
-    module.add_enum('LinkMetricActionValue', ['LINK_METRIC_REQUEST', 'LINK_METRIC_REPORT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PathSelectionActionValue [enumeration]
-    module.add_enum('PathSelectionActionValue', ['PATH_SELECTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::InterworkActionValue [enumeration]
-    module.add_enum('InterworkActionValue', ['PORTAL_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ResourceCoordinationActionValue [enumeration]
-    module.add_enum('ResourceCoordinationActionValue', ['CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'BEACON_TIMING_REQUEST', 'BEACON_TIMING_RESPONSE', 'TBTT_ADJUSTMENT_REQUEST', 'MESH_CHANNEL_SWITCH_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH', 'MULTIHOP', 'SELF_PROTECTED', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::SelfProtectedActionValue [enumeration]
+    module.add_enum('SelfProtectedActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE', 'GROUP_KEY_INFORM', 'GROUP_KEY_ACK'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MultihopActionValue [enumeration]
+    module.add_enum('MultihopActionValue', ['PROXY_UPDATE', 'PROXY_UPDATE_CONFIRMATION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MeshActionValue [enumeration]
+    module.add_enum('MeshActionValue', ['LINK_METRIC_REPORT', 'PATH_SELECTION', 'PORTAL_ANNOUNCEMENT', 'CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'TBTT_ADJUSTMENT_REQUEST', 'TBTT_ADJUSTMENT_RESPONSE'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::BlockAckActionValue [enumeration]
     module.add_enum('BlockAckActionValue', ['BLOCK_ACK_ADDBA_REQUEST', 'BLOCK_ACK_ADDBA_RESPONSE', 'BLOCK_ACK_DELBA'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue [union]
@@ -416,6 +412,8 @@
     module.add_class('ZipfRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## ampdu-subframe-header.h (module 'wifi'): ns3::AmpduSubframeHeader [class]
     module.add_class('AmpduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader [class]
+    module.add_class('AmsduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
     ## application.h (module 'network'): ns3::Application [class]
     module.add_class('Application', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## attribute.h (module 'core'): ns3::AttributeAccessor [class]
@@ -526,6 +524,8 @@
     module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object'])
     ## mpdu-aggregator.h (module 'wifi'): ns3::MpduAggregator [class]
     module.add_class('MpduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator [class]
+    module.add_class('MsduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice [class]
     module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration]
@@ -612,6 +612,7 @@
     module.add_container('ns3::WifiMcsList', 'unsigned char', container_type=u'vector')
     module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type=u'map')
     module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list')
+    module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list')
     module.add_container('std::map< unsigned int, ns3::Ptr< ns3::OcbWifiMac > >', ('unsigned int', 'ns3::Ptr< ns3::OcbWifiMac >'), container_type=u'map')
     module.add_container('std::vector< ns3::Ptr< ns3::WifiPhy > >', 'ns3::Ptr< ns3::WifiPhy >', container_type=u'vector')
     typehandlers.add_type_alias(u'std::vector< unsigned char, std::allocator< unsigned char > >', u'ns3::WifiMcsList')
@@ -743,7 +744,7 @@
     register_Ns3Ipv6InterfaceContainer_methods(root_module, root_module['ns3::Ipv6InterfaceContainer'])
     register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
     register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address'])
-    register_Ns3MacLowBlockAckEventListener_methods(root_module, root_module['ns3::MacLowBlockAckEventListener'])
+    register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, root_module['ns3::MacLowAggregationCapableTransmissionListener'])
     register_Ns3MacLowDcfListener_methods(root_module, root_module['ns3::MacLowDcfListener'])
     register_Ns3MacLowTransmissionListener_methods(root_module, root_module['ns3::MacLowTransmissionListener'])
     register_Ns3MacLowTransmissionParameters_methods(root_module, root_module['ns3::MacLowTransmissionParameters'])
@@ -861,6 +862,7 @@
     register_Ns3ZetaRandomVariable_methods(root_module, root_module['ns3::ZetaRandomVariable'])
     register_Ns3ZipfRandomVariable_methods(root_module, root_module['ns3::ZipfRandomVariable'])
     register_Ns3AmpduSubframeHeader_methods(root_module, root_module['ns3::AmpduSubframeHeader'])
+    register_Ns3AmsduSubframeHeader_methods(root_module, root_module['ns3::AmsduSubframeHeader'])
     register_Ns3Application_methods(root_module, root_module['ns3::Application'])
     register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
     register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker'])
@@ -914,6 +916,7 @@
     register_Ns3MgtBeaconHeader_methods(root_module, root_module['ns3::MgtBeaconHeader'])
     register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
     register_Ns3MpduAggregator_methods(root_module, root_module['ns3::MpduAggregator'])
+    register_Ns3MsduAggregator_methods(root_module, root_module['ns3::MsduAggregator'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
@@ -2984,67 +2987,82 @@
                    is_static=True)
     return
 
-def register_Ns3MacLowBlockAckEventListener_methods(root_module, cls):
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener(ns3::MacLowBlockAckEventListener const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::MacLowBlockAckEventListener const &', 'arg0')])
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener() [constructor]
+def register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener(ns3::MacLowAggregationCapableTransmissionListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowAggregationCapableTransmissionListener const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener() [constructor]
     cls.add_constructor([])
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
     cls.add_method('BlockAckInactivityTimeout', 
                    'void', 
                    [param('ns3::Mac48Address', 'originator'), param('uint8_t', 'tid')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
     cls.add_method('CompleteMpduTx', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader', 'hdr'), param('ns3::Time', 'tstamp')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
     cls.add_method('CompleteTransfer', 
                    'void', 
                    [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): bool ns3::MacLowBlockAckEventListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowAggregationCapableTransmissionListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
     cls.add_method('GetBlockAckAgreementExists', 
                    'bool', 
                    [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetDestAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('GetDestAddressForAggregation', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::MsduAggregator> ns3::MacLowAggregationCapableTransmissionListener::GetMsduAggregator() const [member function]
+    cls.add_method('GetMsduAggregator', 
+                   'ns3::Ptr< ns3::MsduAggregator >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
     cls.add_method('GetNOutstandingPackets', 
                    'uint32_t', 
                    [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
     cls.add_method('GetNRetryNeededPackets', 
                    'uint32_t', 
                    [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
                    is_const=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
     cls.add_method('GetNextSequenceNumberfor', 
                    'uint16_t', 
                    [param('ns3::WifiMacHeader *', 'hdr')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowBlockAckEventListener::GetQueue() [member function]
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowAggregationCapableTransmissionListener::GetQueue() [member function]
     cls.add_method('GetQueue', 
                    'ns3::Ptr< ns3::WifiMacQueue >', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowBlockAckEventListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetSrcAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('GetSrcAddressForAggregation', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowAggregationCapableTransmissionListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
     cls.add_method('PeekNextPacketInBaQueue', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [param('ns3::WifiMacHeader &', 'header'), param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::Time *', 'timestamp')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
     cls.add_method('PeekNextSequenceNumberfor', 
                    'uint16_t', 
                    [param('ns3::WifiMacHeader *', 'hdr')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
     cls.add_method('RemoveFromBaQueue', 
                    'void', 
                    [param('uint8_t', 'tid'), param('ns3::Mac48Address', 'recipient'), param('uint16_t', 'seqnumber')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::SetAmpdu(bool ampdu) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::SetAmpdu(bool ampdu) [member function]
     cls.add_method('SetAmpdu', 
                    'void', 
                    [param('bool', 'ampdu')], 
@@ -7797,16 +7815,12 @@
     cls.add_constructor([param('ns3::WifiActionHeader::ActionValue const &', 'arg0')])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::blockAck [variable]
     cls.add_instance_attribute('blockAck', 'ns3::WifiActionHeader::BlockAckActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::interwork [variable]
-    cls.add_instance_attribute('interwork', 'ns3::WifiActionHeader::InterworkActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::linkMetrtic [variable]
-    cls.add_instance_attribute('linkMetrtic', 'ns3::WifiActionHeader::LinkMetricActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::pathSelection [variable]
-    cls.add_instance_attribute('pathSelection', 'ns3::WifiActionHeader::PathSelectionActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::peerLink [variable]
-    cls.add_instance_attribute('peerLink', 'ns3::WifiActionHeader::PeerLinkMgtActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::resourceCoordination [variable]
-    cls.add_instance_attribute('resourceCoordination', 'ns3::WifiActionHeader::ResourceCoordinationActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::meshAction [variable]
+    cls.add_instance_attribute('meshAction', 'ns3::WifiActionHeader::MeshActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::multihopAction [variable]
+    cls.add_instance_attribute('multihopAction', 'ns3::WifiActionHeader::MultihopActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::selfProtectedAction [variable]
+    cls.add_instance_attribute('selfProtectedAction', 'ns3::WifiActionHeader::SelfProtectedActionValue', is_const=False)
     return
 
 def register_Ns3WifiInformationElement_methods(root_module, cls):
@@ -8625,6 +8639,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -9098,10 +9116,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -9275,10 +9293,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiMode,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiTxVector,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
@@ -9963,6 +9981,70 @@
                    [])
     return
 
+def register_Ns3AmsduSubframeHeader_methods(root_module, cls):
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader(ns3::AmsduSubframeHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AmsduSubframeHeader const &', 'arg0')])
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader() [constructor]
+    cls.add_constructor([])
+    ## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetDestinationAddr() const [member function]
+    cls.add_method('GetDestinationAddr', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::TypeId ns3::AmsduSubframeHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): uint16_t ns3::AmsduSubframeHeader::GetLength() const [member function]
+    cls.add_method('GetLength', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetSourceAddr() const [member function]
+    cls.add_method('GetSourceAddr', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## amsdu-subframe-header.h (module 'wifi'): static ns3::TypeId ns3::AmsduSubframeHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetDestinationAddr(ns3::Mac48Address to) [member function]
+    cls.add_method('SetDestinationAddr', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'to')])
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetLength(uint16_t arg0) [member function]
+    cls.add_method('SetLength', 
+                   'void', 
+                   [param('uint16_t', 'arg0')])
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetSourceAddr(ns3::Mac48Address to) [member function]
+    cls.add_method('SetSourceAddr', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'to')])
+    return
+
 def register_Ns3Application_methods(root_module, cls):
     ## application.h (module 'network'): ns3::Application::Application(ns3::Application const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Application const &', 'arg0')])
@@ -12852,10 +12934,10 @@
     cls.add_method('CreateBlockAckAgreement', 
                    'void', 
                    [param('ns3::MgtAddBaResponseHeader const *', 'respHdr'), param('ns3::Mac48Address', 'originator'), param('uint16_t', 'startingSeq')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::DeaggregateAmpduAndReceive(ns3::Ptr<ns3::Packet> aggregatedPacket, double rxSnr, ns3::WifiMode txMode, ns3::WifiPreamble preamble) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::DeaggregateAmpduAndReceive(ns3::Ptr<ns3::Packet> aggregatedPacket, double rxSnr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('DeaggregateAmpduAndReceive', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble')])
+                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('double', 'rxSnr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
     ## mac-low.h (module 'wifi'): void ns3::MacLow::DestroyBlockAckAgreement(ns3::Mac48Address originator, uint8_t tid) [member function]
     cls.add_method('DestroyBlockAckAgreement', 
                    'void', 
@@ -12941,14 +13023,14 @@
     cls.add_method('ReceiveError', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'rxSnr')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveOk(ns3::Ptr<ns3::Packet> packet, double rxSnr, ns3::WifiMode txMode, ns3::WifiPreamble preamble, bool ampduSubframe) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveOk(ns3::Ptr<ns3::Packet> packet, double rxSnr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, bool ampduSubframe) [member function]
     cls.add_method('ReceiveOk', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble'), param('bool', 'ampduSubframe')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowBlockAckEventListener * listener) [member function]
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble'), param('bool', 'ampduSubframe')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowAggregationCapableTransmissionListener * listener) [member function]
     cls.add_method('RegisterBlockAckListenerForAc', 
                    'void', 
-                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
+                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowAggregationCapableTransmissionListener *', 'listener')])
     ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterDcfListener(ns3::MacLowDcfListener * listener) [member function]
     cls.add_method('RegisterDcfListener', 
                    'void', 
@@ -13026,8 +13108,8 @@
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters', 'parameters'), param('ns3::MacLowTransmissionListener *', 'listener')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): bool ns3::MacLow::StopAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
-    cls.add_method('StopAggregation', 
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::StopMpduAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
+    cls.add_method('StopMpduAggregation', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'peekedPacket'), param('ns3::WifiMacHeader', 'peekedHdr'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('uint16_t', 'size')], 
                    is_const=True)
@@ -13149,6 +13231,28 @@
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
+                   is_static=True)
+    return
+
+def register_Ns3MsduAggregator_methods(root_module, cls):
+    ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator() [constructor]
+    cls.add_constructor([])
+    ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator(ns3::MsduAggregator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MsduAggregator const &', 'arg0')])
+    ## msdu-aggregator.h (module 'wifi'): bool ns3::MsduAggregator::Aggregate(ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Packet> aggregatedPacket, ns3::Mac48Address src, ns3::Mac48Address dest) [member function]
+    cls.add_method('Aggregate', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dest')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## msdu-aggregator.h (module 'wifi'): static std::list<std::pair<ns3::Ptr<ns3::Packet>, ns3::AmsduSubframeHeader>, std::allocator<std::pair<ns3::Ptr<ns3::Packet>, ns3::AmsduSubframeHeader> > > ns3::MsduAggregator::Deaggregate(ns3::Ptr<ns3::Packet> aggregatedPacket) [member function]
+    cls.add_method('Deaggregate', 
+                   'std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 
+                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], 
+                   is_static=True)
+    ## msdu-aggregator.h (module 'wifi'): static ns3::TypeId ns3::MsduAggregator::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
                    is_static=True)
     return
 
diff -Naur ns-3.22/src/wave/bindings/modulegen__gcc_LP64.py ns-3.23/src/wave/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/wave/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -128,8 +128,8 @@
     module.add_class('Mac48Address', import_from_module='ns.network')
     ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
     root_module['ns3::Mac48Address'].implicitly_converts_to(root_module['ns3::Address'])
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener [class]
-    module.add_class('MacLowBlockAckEventListener', allow_subclassing=True, import_from_module='ns.wifi')
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener [class]
+    module.add_class('MacLowAggregationCapableTransmissionListener', allow_subclassing=True, import_from_module='ns.wifi')
     ## mac-low.h (module 'wifi'): ns3::MacLowDcfListener [class]
     module.add_class('MacLowDcfListener', allow_subclassing=True, import_from_module='ns.wifi')
     ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener [class]
@@ -375,17 +375,13 @@
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader [class]
     module.add_class('WifiActionHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::CategoryValue [enumeration]
-    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH_PEERING_MGT', 'MESH_LINK_METRIC', 'MESH_PATH_SELECTION', 'MESH_INTERWORKING', 'MESH_RESOURCE_COORDINATION', 'MESH_PROXY_FORWARDING', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PeerLinkMgtActionValue [enumeration]
-    module.add_enum('PeerLinkMgtActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::LinkMetricActionValue [enumeration]
-    module.add_enum('LinkMetricActionValue', ['LINK_METRIC_REQUEST', 'LINK_METRIC_REPORT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PathSelectionActionValue [enumeration]
-    module.add_enum('PathSelectionActionValue', ['PATH_SELECTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::InterworkActionValue [enumeration]
-    module.add_enum('InterworkActionValue', ['PORTAL_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ResourceCoordinationActionValue [enumeration]
-    module.add_enum('ResourceCoordinationActionValue', ['CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'BEACON_TIMING_REQUEST', 'BEACON_TIMING_RESPONSE', 'TBTT_ADJUSTMENT_REQUEST', 'MESH_CHANNEL_SWITCH_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH', 'MULTIHOP', 'SELF_PROTECTED', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::SelfProtectedActionValue [enumeration]
+    module.add_enum('SelfProtectedActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE', 'GROUP_KEY_INFORM', 'GROUP_KEY_ACK'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MultihopActionValue [enumeration]
+    module.add_enum('MultihopActionValue', ['PROXY_UPDATE', 'PROXY_UPDATE_CONFIRMATION'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MeshActionValue [enumeration]
+    module.add_enum('MeshActionValue', ['LINK_METRIC_REPORT', 'PATH_SELECTION', 'PORTAL_ANNOUNCEMENT', 'CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'TBTT_ADJUSTMENT_REQUEST', 'TBTT_ADJUSTMENT_RESPONSE'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::BlockAckActionValue [enumeration]
     module.add_enum('BlockAckActionValue', ['BLOCK_ACK_ADDBA_REQUEST', 'BLOCK_ACK_ADDBA_RESPONSE', 'BLOCK_ACK_DELBA'], outer_class=root_module['ns3::WifiActionHeader'], import_from_module='ns.wifi')
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue [union]
@@ -416,6 +412,8 @@
     module.add_class('ZipfRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
     ## ampdu-subframe-header.h (module 'wifi'): ns3::AmpduSubframeHeader [class]
     module.add_class('AmpduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader [class]
+    module.add_class('AmsduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
     ## application.h (module 'network'): ns3::Application [class]
     module.add_class('Application', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## attribute.h (module 'core'): ns3::AttributeAccessor [class]
@@ -526,6 +524,8 @@
     module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object'])
     ## mpdu-aggregator.h (module 'wifi'): ns3::MpduAggregator [class]
     module.add_class('MpduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+    ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator [class]
+    module.add_class('MsduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice [class]
     module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object'])
     ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration]
@@ -612,6 +612,7 @@
     module.add_container('ns3::WifiMcsList', 'unsigned char', container_type=u'vector')
     module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type=u'map')
     module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list')
+    module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list')
     module.add_container('std::map< unsigned int, ns3::Ptr< ns3::OcbWifiMac > >', ('unsigned int', 'ns3::Ptr< ns3::OcbWifiMac >'), container_type=u'map')
     module.add_container('std::vector< ns3::Ptr< ns3::WifiPhy > >', 'ns3::Ptr< ns3::WifiPhy >', container_type=u'vector')
     typehandlers.add_type_alias(u'std::vector< unsigned char, std::allocator< unsigned char > >', u'ns3::WifiMcsList')
@@ -743,7 +744,7 @@
     register_Ns3Ipv6InterfaceContainer_methods(root_module, root_module['ns3::Ipv6InterfaceContainer'])
     register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
     register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address'])
-    register_Ns3MacLowBlockAckEventListener_methods(root_module, root_module['ns3::MacLowBlockAckEventListener'])
+    register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, root_module['ns3::MacLowAggregationCapableTransmissionListener'])
     register_Ns3MacLowDcfListener_methods(root_module, root_module['ns3::MacLowDcfListener'])
     register_Ns3MacLowTransmissionListener_methods(root_module, root_module['ns3::MacLowTransmissionListener'])
     register_Ns3MacLowTransmissionParameters_methods(root_module, root_module['ns3::MacLowTransmissionParameters'])
@@ -861,6 +862,7 @@
     register_Ns3ZetaRandomVariable_methods(root_module, root_module['ns3::ZetaRandomVariable'])
     register_Ns3ZipfRandomVariable_methods(root_module, root_module['ns3::ZipfRandomVariable'])
     register_Ns3AmpduSubframeHeader_methods(root_module, root_module['ns3::AmpduSubframeHeader'])
+    register_Ns3AmsduSubframeHeader_methods(root_module, root_module['ns3::AmsduSubframeHeader'])
     register_Ns3Application_methods(root_module, root_module['ns3::Application'])
     register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
     register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker'])
@@ -914,6 +916,7 @@
     register_Ns3MgtBeaconHeader_methods(root_module, root_module['ns3::MgtBeaconHeader'])
     register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
     register_Ns3MpduAggregator_methods(root_module, root_module['ns3::MpduAggregator'])
+    register_Ns3MsduAggregator_methods(root_module, root_module['ns3::MsduAggregator'])
     register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
     register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
     register_Ns3Node_methods(root_module, root_module['ns3::Node'])
@@ -2984,67 +2987,82 @@
                    is_static=True)
     return
 
-def register_Ns3MacLowBlockAckEventListener_methods(root_module, cls):
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener(ns3::MacLowBlockAckEventListener const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::MacLowBlockAckEventListener const &', 'arg0')])
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener() [constructor]
+def register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener(ns3::MacLowAggregationCapableTransmissionListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowAggregationCapableTransmissionListener const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener() [constructor]
     cls.add_constructor([])
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
     cls.add_method('BlockAckInactivityTimeout', 
                    'void', 
                    [param('ns3::Mac48Address', 'originator'), param('uint8_t', 'tid')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
     cls.add_method('CompleteMpduTx', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader', 'hdr'), param('ns3::Time', 'tstamp')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
     cls.add_method('CompleteTransfer', 
                    'void', 
                    [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): bool ns3::MacLowBlockAckEventListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowAggregationCapableTransmissionListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
     cls.add_method('GetBlockAckAgreementExists', 
                    'bool', 
                    [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetDestAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('GetDestAddressForAggregation', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::MsduAggregator> ns3::MacLowAggregationCapableTransmissionListener::GetMsduAggregator() const [member function]
+    cls.add_method('GetMsduAggregator', 
+                   'ns3::Ptr< ns3::MsduAggregator >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
     cls.add_method('GetNOutstandingPackets', 
                    'uint32_t', 
                    [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
     cls.add_method('GetNRetryNeededPackets', 
                    'uint32_t', 
                    [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
                    is_const=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
     cls.add_method('GetNextSequenceNumberfor', 
                    'uint16_t', 
                    [param('ns3::WifiMacHeader *', 'hdr')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowBlockAckEventListener::GetQueue() [member function]
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowAggregationCapableTransmissionListener::GetQueue() [member function]
     cls.add_method('GetQueue', 
                    'ns3::Ptr< ns3::WifiMacQueue >', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowBlockAckEventListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetSrcAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('GetSrcAddressForAggregation', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowAggregationCapableTransmissionListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
     cls.add_method('PeekNextPacketInBaQueue', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [param('ns3::WifiMacHeader &', 'header'), param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::Time *', 'timestamp')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
     cls.add_method('PeekNextSequenceNumberfor', 
                    'uint16_t', 
                    [param('ns3::WifiMacHeader *', 'hdr')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
     cls.add_method('RemoveFromBaQueue', 
                    'void', 
                    [param('uint8_t', 'tid'), param('ns3::Mac48Address', 'recipient'), param('uint16_t', 'seqnumber')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::SetAmpdu(bool ampdu) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::SetAmpdu(bool ampdu) [member function]
     cls.add_method('SetAmpdu', 
                    'void', 
                    [param('bool', 'ampdu')], 
@@ -7797,16 +7815,12 @@
     cls.add_constructor([param('ns3::WifiActionHeader::ActionValue const &', 'arg0')])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::blockAck [variable]
     cls.add_instance_attribute('blockAck', 'ns3::WifiActionHeader::BlockAckActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::interwork [variable]
-    cls.add_instance_attribute('interwork', 'ns3::WifiActionHeader::InterworkActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::linkMetrtic [variable]
-    cls.add_instance_attribute('linkMetrtic', 'ns3::WifiActionHeader::LinkMetricActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::pathSelection [variable]
-    cls.add_instance_attribute('pathSelection', 'ns3::WifiActionHeader::PathSelectionActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::peerLink [variable]
-    cls.add_instance_attribute('peerLink', 'ns3::WifiActionHeader::PeerLinkMgtActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::resourceCoordination [variable]
-    cls.add_instance_attribute('resourceCoordination', 'ns3::WifiActionHeader::ResourceCoordinationActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::meshAction [variable]
+    cls.add_instance_attribute('meshAction', 'ns3::WifiActionHeader::MeshActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::multihopAction [variable]
+    cls.add_instance_attribute('multihopAction', 'ns3::WifiActionHeader::MultihopActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::selfProtectedAction [variable]
+    cls.add_instance_attribute('selfProtectedAction', 'ns3::WifiActionHeader::SelfProtectedActionValue', is_const=False)
     return
 
 def register_Ns3WifiInformationElement_methods(root_module, cls):
@@ -8625,6 +8639,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -9098,10 +9116,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -9275,10 +9293,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiMode,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void,ns3::Ptr<ns3::Packet>,double,ns3::WifiTxVector,ns3::WifiPreamble,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
@@ -9963,6 +9981,70 @@
                    [])
     return
 
+def register_Ns3AmsduSubframeHeader_methods(root_module, cls):
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader(ns3::AmsduSubframeHeader const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AmsduSubframeHeader const &', 'arg0')])
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader() [constructor]
+    cls.add_constructor([])
+    ## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+    cls.add_method('Deserialize', 
+                   'uint32_t', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetDestinationAddr() const [member function]
+    cls.add_method('GetDestinationAddr', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::TypeId ns3::AmsduSubframeHeader::GetInstanceTypeId() const [member function]
+    cls.add_method('GetInstanceTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): uint16_t ns3::AmsduSubframeHeader::GetLength() const [member function]
+    cls.add_method('GetLength', 
+                   'uint16_t', 
+                   [], 
+                   is_const=True)
+    ## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::GetSerializedSize() const [member function]
+    cls.add_method('GetSerializedSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetSourceAddr() const [member function]
+    cls.add_method('GetSourceAddr', 
+                   'ns3::Mac48Address', 
+                   [], 
+                   is_const=True)
+    ## amsdu-subframe-header.h (module 'wifi'): static ns3::TypeId ns3::AmsduSubframeHeader::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Print(std::ostream & os) const [member function]
+    cls.add_method('Print', 
+                   'void', 
+                   [param('std::ostream &', 'os')], 
+                   is_const=True, is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+    cls.add_method('Serialize', 
+                   'void', 
+                   [param('ns3::Buffer::Iterator', 'start')], 
+                   is_const=True, is_virtual=True)
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetDestinationAddr(ns3::Mac48Address to) [member function]
+    cls.add_method('SetDestinationAddr', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'to')])
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetLength(uint16_t arg0) [member function]
+    cls.add_method('SetLength', 
+                   'void', 
+                   [param('uint16_t', 'arg0')])
+    ## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetSourceAddr(ns3::Mac48Address to) [member function]
+    cls.add_method('SetSourceAddr', 
+                   'void', 
+                   [param('ns3::Mac48Address', 'to')])
+    return
+
 def register_Ns3Application_methods(root_module, cls):
     ## application.h (module 'network'): ns3::Application::Application(ns3::Application const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Application const &', 'arg0')])
@@ -12852,10 +12934,10 @@
     cls.add_method('CreateBlockAckAgreement', 
                    'void', 
                    [param('ns3::MgtAddBaResponseHeader const *', 'respHdr'), param('ns3::Mac48Address', 'originator'), param('uint16_t', 'startingSeq')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::DeaggregateAmpduAndReceive(ns3::Ptr<ns3::Packet> aggregatedPacket, double rxSnr, ns3::WifiMode txMode, ns3::WifiPreamble preamble) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::DeaggregateAmpduAndReceive(ns3::Ptr<ns3::Packet> aggregatedPacket, double rxSnr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('DeaggregateAmpduAndReceive', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble')])
+                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('double', 'rxSnr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
     ## mac-low.h (module 'wifi'): void ns3::MacLow::DestroyBlockAckAgreement(ns3::Mac48Address originator, uint8_t tid) [member function]
     cls.add_method('DestroyBlockAckAgreement', 
                    'void', 
@@ -12941,14 +13023,14 @@
     cls.add_method('ReceiveError', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'rxSnr')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveOk(ns3::Ptr<ns3::Packet> packet, double rxSnr, ns3::WifiMode txMode, ns3::WifiPreamble preamble, bool ampduSubframe) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveOk(ns3::Ptr<ns3::Packet> packet, double rxSnr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, bool ampduSubframe) [member function]
     cls.add_method('ReceiveOk', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble'), param('bool', 'ampduSubframe')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowBlockAckEventListener * listener) [member function]
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble'), param('bool', 'ampduSubframe')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowAggregationCapableTransmissionListener * listener) [member function]
     cls.add_method('RegisterBlockAckListenerForAc', 
                    'void', 
-                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
+                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowAggregationCapableTransmissionListener *', 'listener')])
     ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterDcfListener(ns3::MacLowDcfListener * listener) [member function]
     cls.add_method('RegisterDcfListener', 
                    'void', 
@@ -13026,8 +13108,8 @@
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters', 'parameters'), param('ns3::MacLowTransmissionListener *', 'listener')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): bool ns3::MacLow::StopAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
-    cls.add_method('StopAggregation', 
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::StopMpduAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
+    cls.add_method('StopMpduAggregation', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'peekedPacket'), param('ns3::WifiMacHeader', 'peekedHdr'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('uint16_t', 'size')], 
                    is_const=True)
@@ -13149,6 +13231,28 @@
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
                    [], 
+                   is_static=True)
+    return
+
+def register_Ns3MsduAggregator_methods(root_module, cls):
+    ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator() [constructor]
+    cls.add_constructor([])
+    ## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator(ns3::MsduAggregator const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MsduAggregator const &', 'arg0')])
+    ## msdu-aggregator.h (module 'wifi'): bool ns3::MsduAggregator::Aggregate(ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Packet> aggregatedPacket, ns3::Mac48Address src, ns3::Mac48Address dest) [member function]
+    cls.add_method('Aggregate', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dest')], 
+                   is_pure_virtual=True, is_virtual=True)
+    ## msdu-aggregator.h (module 'wifi'): static std::list<std::pair<ns3::Ptr<ns3::Packet>, ns3::AmsduSubframeHeader>, std::allocator<std::pair<ns3::Ptr<ns3::Packet>, ns3::AmsduSubframeHeader> > > ns3::MsduAggregator::Deaggregate(ns3::Ptr<ns3::Packet> aggregatedPacket) [member function]
+    cls.add_method('Deaggregate', 
+                   'std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 
+                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')], 
+                   is_static=True)
+    ## msdu-aggregator.h (module 'wifi'): static ns3::TypeId ns3::MsduAggregator::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
                    is_static=True)
     return
 
diff -Naur ns-3.22/src/wave/examples/vanet-routing-compare.cc ns-3.23/src/wave/examples/vanet-routing-compare.cc
--- ns-3.22/src/wave/examples/vanet-routing-compare.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/examples/vanet-routing-compare.cc	2015-05-13 11:05:27.000000000 -0700
@@ -261,7 +261,11 @@
   : m_RxBytes (0),
     m_cumulativeRxBytes (0),
     m_RxPkts (0),
-    m_cumulativeRxPkts (0)
+    m_cumulativeRxPkts (0),
+    m_TxBytes (0),
+    m_cumulativeTxBytes (0),
+    m_TxPkts (0),
+    m_cumulativeTxPkts (0)
 {
 }
 
@@ -562,6 +566,9 @@
 
   switch (m_protocol)
     {
+    case 0:
+      m_protocolName = "NONE";
+      break;
     case 1:
       if (m_routingTables != 0)
         {
@@ -570,21 +577,13 @@
       list.Add (olsr, 100);
       m_protocolName = "OLSR";
       break;
-    case 0:
     case 2:
       if (m_routingTables != 0)
         {
           aodv.PrintRoutingTableAllAt (rtt, rtw);
         }
       list.Add (aodv, 100);
-      if (m_protocol == 0)
-        {
-          m_protocolName = "NONE";
-        }
-      else
-        {
-          m_protocolName = "AODV";
-        }
+      m_protocolName = "AODV";
       break;
     case 3:
       if (m_routingTables != 0)
@@ -595,10 +594,12 @@
       m_protocolName = "DSDV";
       break;
     case 4:
+      // setup is later
       m_protocolName = "DSR";
       break;
     default:
       NS_FATAL_ERROR ("No such protocol:" << m_protocol);
+      break;
     }
 
   if (m_protocol < 4)
diff -Naur ns-3.22/src/wave/helper/wave-helper.cc ns-3.23/src/wave/helper/wave-helper.cc
--- ns-3.22/src/wave/helper/wave-helper.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/helper/wave-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -27,6 +27,7 @@
 #include "ns3/wave-net-device.h"
 #include "ns3/minstrel-wifi-manager.h"
 #include "ns3/radiotap-header.h"
+#include "ns3/unused.h"
 #include "wave-mac-helper.h"
 #include "wave-helper.h"
 
@@ -484,12 +485,7 @@
   try
     {
       const QosWaveMacHelper& qosMac = dynamic_cast<const QosWaveMacHelper&> (macHelper);
-      // below check will never fail, just used for survive from
-      // gcc warn "-Wunused-but-set-variable"
-      if (&qosMac == 0)
-        {
-          NS_FATAL_ERROR ("it could never get here");
-        }
+      NS_UNUSED (qosMac);
     }
   catch (const std::bad_cast &)
     {
diff -Naur ns-3.22/src/wave/model/bsm-application.cc ns-3.23/src/wave/model/bsm-application.cc
--- ns-3.22/src/wave/model/bsm-application.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/bsm-application.cc	2015-05-13 11:05:27.000000000 -0700
@@ -42,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::BsmApplication")
     .SetParent<Application> ()
+    .SetGroupName ("Wave")
     .AddConstructor<BsmApplication> ()
     ;
   return tid;
diff -Naur ns-3.22/src/wave/model/channel-coordinator.cc ns-3.23/src/wave/model/channel-coordinator.cc
--- ns-3.22/src/wave/model/channel-coordinator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/channel-coordinator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,6 +40,7 @@
 {
   static TypeId tid = TypeId ("ns3::ChannelCoordinator")
     .SetParent<Object> ()
+    .SetGroupName ("Wave")
     .AddConstructor<ChannelCoordinator> ()
     .AddAttribute ("CchInterval", "CCH Interval, default value is 50ms.",
                    TimeValue (GetDefaultCchInterval ()),
diff -Naur ns-3.22/src/wave/model/channel-manager.cc ns-3.23/src/wave/model/channel-manager.cc
--- ns-3.22/src/wave/model/channel-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/channel-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::ChannelManager")
     .SetParent<Object> ()
+    .SetGroupName ("Wave")
     .AddConstructor<ChannelManager> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wave/model/channel-scheduler.cc ns-3.23/src/wave/model/channel-scheduler.cc
--- ns-3.22/src/wave/model/channel-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/channel-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::ChannelScheduler")
     .SetParent<Object> ()
+    .SetGroupName ("Wave")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/wave/model/default-channel-scheduler.cc ns-3.23/src/wave/model/default-channel-scheduler.cc
--- ns-3.22/src/wave/model/default-channel-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/default-channel-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -56,6 +56,7 @@
 {
   static TypeId tid = TypeId ("ns3::DefaultChannelScheduler")
     .SetParent<ChannelScheduler> ()
+    .SetGroupName ("Wave")
     .AddConstructor<DefaultChannelScheduler> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wave/model/higher-tx-tag.cc ns-3.23/src/wave/model/higher-tx-tag.cc
--- ns-3.22/src/wave/model/higher-tx-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/higher-tx-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::HigherLayerTxVectorTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wave")
     .AddConstructor<HigherLayerTxVectorTag> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wave/model/ocb-wifi-mac.cc ns-3.23/src/wave/model/ocb-wifi-mac.cc
--- ns-3.22/src/wave/model/ocb-wifi-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/ocb-wifi-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::OcbWifiMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Wave")
     .AddConstructor<OcbWifiMac> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wave/model/vendor-specific-action.cc ns-3.23/src/wave/model/vendor-specific-action.cc
--- ns-3.22/src/wave/model/vendor-specific-action.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/vendor-specific-action.cc	2015-05-13 11:05:27.000000000 -0700
@@ -247,6 +247,7 @@
 {
   static TypeId tid = TypeId ("ns3::VendorSpecificActionHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wave")
     .AddConstructor<VendorSpecificActionHeader> ()
   ;
 
diff -Naur ns-3.22/src/wave/model/vsa-manager.cc ns-3.23/src/wave/model/vsa-manager.cc
--- ns-3.22/src/wave/model/vsa-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/vsa-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::VsaManager")
     .SetParent<Object> ()
+    .SetGroupName ("Wave")
     .AddConstructor<VsaManager> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wave/model/wave-mac-low.cc ns-3.23/src/wave/model/wave-mac-low.cc
--- ns-3.22/src/wave/model/wave-mac-low.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/wave-mac-low.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::WaveMacLow")
     .SetParent<MacLow> ()
+    .SetGroupName ("Wave")
     .AddConstructor<WaveMacLow> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wave/model/wave-net-device.cc ns-3.23/src/wave/model/wave-net-device.cc
--- ns-3.22/src/wave/model/wave-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wave/model/wave-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::WaveNetDevice")
     .SetParent<NetDevice> ()
+    .SetGroupName ("Wave")
     .AddConstructor<WaveNetDevice> ()
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (MAX_MSDU_SIZE - LLC_SNAP_HEADER_LENGTH),
diff -Naur ns-3.22/src/wifi/bindings/callbacks_list.py ns-3.23/src/wifi/bindings/callbacks_list.py
--- ns-3.22/src/wifi/bindings/callbacks_list.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/bindings/callbacks_list.py	2015-05-13 11:05:27.000000000 -0700
@@ -1,7 +1,7 @@
 callback_classes = [
     ['void', 'ns3::Ptr<ns3::Packet const>', 'double', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['void', 'ns3::Ptr<ns3::Packet>', 'double', 'ns3::WifiMode', 'ns3::WifiPreamble', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Ptr<ns3::Packet>', 'double', 'ns3::WifiTxVector', 'ns3::WifiPreamble', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::WifiMacHeader const*', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
diff -Naur ns-3.22/src/wifi/bindings/modulegen__gcc_ILP32.py ns-3.23/src/wifi/bindings/modulegen__gcc_ILP32.py
--- ns-3.22/src/wifi/bindings/modulegen__gcc_ILP32.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/bindings/modulegen__gcc_ILP32.py	2015-05-13 11:05:27.000000000 -0700
@@ -112,8 +112,8 @@
     module.add_class('Mac48Address', import_from_module='ns.network')
     ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
     root_module['ns3::Mac48Address'].implicitly_converts_to(root_module['ns3::Address'])
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener [class]
-    module.add_class('MacLowBlockAckEventListener', allow_subclassing=True)
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener [class]
+    module.add_class('MacLowAggregationCapableTransmissionListener', allow_subclassing=True)
     ## mac-low.h (module 'wifi'): ns3::MacLowDcfListener [class]
     module.add_class('MacLowDcfListener', allow_subclassing=True)
     ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener [class]
@@ -319,17 +319,13 @@
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader [class]
     module.add_class('WifiActionHeader', parent=root_module['ns3::Header'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::CategoryValue [enumeration]
-    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH_PEERING_MGT', 'MESH_LINK_METRIC', 'MESH_PATH_SELECTION', 'MESH_INTERWORKING', 'MESH_RESOURCE_COORDINATION', 'MESH_PROXY_FORWARDING', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PeerLinkMgtActionValue [enumeration]
-    module.add_enum('PeerLinkMgtActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::LinkMetricActionValue [enumeration]
-    module.add_enum('LinkMetricActionValue', ['LINK_METRIC_REQUEST', 'LINK_METRIC_REPORT'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PathSelectionActionValue [enumeration]
-    module.add_enum('PathSelectionActionValue', ['PATH_SELECTION'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::InterworkActionValue [enumeration]
-    module.add_enum('InterworkActionValue', ['PORTAL_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ResourceCoordinationActionValue [enumeration]
-    module.add_enum('ResourceCoordinationActionValue', ['CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'BEACON_TIMING_REQUEST', 'BEACON_TIMING_RESPONSE', 'TBTT_ADJUSTMENT_REQUEST', 'MESH_CHANNEL_SWITCH_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'])
+    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH', 'MULTIHOP', 'SELF_PROTECTED', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::SelfProtectedActionValue [enumeration]
+    module.add_enum('SelfProtectedActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE', 'GROUP_KEY_INFORM', 'GROUP_KEY_ACK'], outer_class=root_module['ns3::WifiActionHeader'])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MultihopActionValue [enumeration]
+    module.add_enum('MultihopActionValue', ['PROXY_UPDATE', 'PROXY_UPDATE_CONFIRMATION'], outer_class=root_module['ns3::WifiActionHeader'])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MeshActionValue [enumeration]
+    module.add_enum('MeshActionValue', ['LINK_METRIC_REPORT', 'PATH_SELECTION', 'PORTAL_ANNOUNCEMENT', 'CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'TBTT_ADJUSTMENT_REQUEST', 'TBTT_ADJUSTMENT_RESPONSE'], outer_class=root_module['ns3::WifiActionHeader'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::BlockAckActionValue [enumeration]
     module.add_enum('BlockAckActionValue', ['BLOCK_ACK_ADDBA_REQUEST', 'BLOCK_ACK_ADDBA_RESPONSE', 'BLOCK_ACK_DELBA'], outer_class=root_module['ns3::WifiActionHeader'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue [union]
@@ -706,7 +702,7 @@
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
     register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
     register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address'])
-    register_Ns3MacLowBlockAckEventListener_methods(root_module, root_module['ns3::MacLowBlockAckEventListener'])
+    register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, root_module['ns3::MacLowAggregationCapableTransmissionListener'])
     register_Ns3MacLowDcfListener_methods(root_module, root_module['ns3::MacLowDcfListener'])
     register_Ns3MacLowTransmissionListener_methods(root_module, root_module['ns3::MacLowTransmissionListener'])
     register_Ns3MacLowTransmissionParameters_methods(root_module, root_module['ns3::MacLowTransmissionParameters'])
@@ -2181,12 +2177,16 @@
     cls.add_constructor([param('ns3::InterferenceHelper const &', 'arg0')])
     ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::InterferenceHelper() [constructor]
     cls.add_constructor([])
-    ## interference-helper.h (module 'wifi'): ns3::Ptr<ns3::InterferenceHelper::Event> ns3::InterferenceHelper::Add(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble, ns3::Time duration, double rxPower, ns3::WifiTxVector txvector) [member function]
+    ## interference-helper.h (module 'wifi'): ns3::Ptr<ns3::InterferenceHelper::Event> ns3::InterferenceHelper::Add(uint32_t size, ns3::WifiTxVector txvector, ns3::WifiPreamble preamble, ns3::Time duration, double rxPower) [member function]
     cls.add_method('Add', 
                    'ns3::Ptr< ns3::InterferenceHelper::Event >', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::Time', 'duration'), param('double', 'rxPower'), param('ns3::WifiTxVector', 'txvector')])
-    ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::SnrPer ns3::InterferenceHelper::CalculateSnrPer(ns3::Ptr<ns3::InterferenceHelper::Event> event) [member function]
-    cls.add_method('CalculateSnrPer', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble'), param('ns3::Time', 'duration'), param('double', 'rxPower')])
+    ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::SnrPer ns3::InterferenceHelper::CalculatePlcpHeaderSnrPer(ns3::Ptr<ns3::InterferenceHelper::Event> event) [member function]
+    cls.add_method('CalculatePlcpHeaderSnrPer', 
+                   'ns3::InterferenceHelper::SnrPer', 
+                   [param('ns3::Ptr< ns3::InterferenceHelper::Event >', 'event')])
+    ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::SnrPer ns3::InterferenceHelper::CalculatePlcpPayloadSnrPer(ns3::Ptr<ns3::InterferenceHelper::Event> event) [member function]
+    cls.add_method('CalculatePlcpPayloadSnrPer', 
                    'ns3::InterferenceHelper::SnrPer', 
                    [param('ns3::Ptr< ns3::InterferenceHelper::Event >', 'event')])
     ## interference-helper.h (module 'wifi'): void ns3::InterferenceHelper::EraseEvents() [member function]
@@ -2736,67 +2736,82 @@
                    is_static=True)
     return
 
-def register_Ns3MacLowBlockAckEventListener_methods(root_module, cls):
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener(ns3::MacLowBlockAckEventListener const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::MacLowBlockAckEventListener const &', 'arg0')])
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener() [constructor]
+def register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener(ns3::MacLowAggregationCapableTransmissionListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowAggregationCapableTransmissionListener const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener() [constructor]
     cls.add_constructor([])
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
     cls.add_method('BlockAckInactivityTimeout', 
                    'void', 
                    [param('ns3::Mac48Address', 'originator'), param('uint8_t', 'tid')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
     cls.add_method('CompleteMpduTx', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader', 'hdr'), param('ns3::Time', 'tstamp')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
     cls.add_method('CompleteTransfer', 
                    'void', 
                    [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): bool ns3::MacLowBlockAckEventListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowAggregationCapableTransmissionListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
     cls.add_method('GetBlockAckAgreementExists', 
                    'bool', 
                    [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetDestAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('GetDestAddressForAggregation', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::MsduAggregator> ns3::MacLowAggregationCapableTransmissionListener::GetMsduAggregator() const [member function]
+    cls.add_method('GetMsduAggregator', 
+                   'ns3::Ptr< ns3::MsduAggregator >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
     cls.add_method('GetNOutstandingPackets', 
                    'uint32_t', 
                    [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
     cls.add_method('GetNRetryNeededPackets', 
                    'uint32_t', 
                    [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
                    is_const=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
     cls.add_method('GetNextSequenceNumberfor', 
                    'uint16_t', 
                    [param('ns3::WifiMacHeader *', 'hdr')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowBlockAckEventListener::GetQueue() [member function]
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowAggregationCapableTransmissionListener::GetQueue() [member function]
     cls.add_method('GetQueue', 
                    'ns3::Ptr< ns3::WifiMacQueue >', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowBlockAckEventListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetSrcAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('GetSrcAddressForAggregation', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowAggregationCapableTransmissionListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
     cls.add_method('PeekNextPacketInBaQueue', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [param('ns3::WifiMacHeader &', 'header'), param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::Time *', 'timestamp')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
     cls.add_method('PeekNextSequenceNumberfor', 
                    'uint16_t', 
                    [param('ns3::WifiMacHeader *', 'hdr')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
     cls.add_method('RemoveFromBaQueue', 
                    'void', 
                    [param('uint8_t', 'tid'), param('ns3::Mac48Address', 'recipient'), param('uint16_t', 'seqnumber')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::SetAmpdu(bool ampdu) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::SetAmpdu(bool ampdu) [member function]
     cls.add_method('SetAmpdu', 
                    'void', 
                    [param('bool', 'ampdu')], 
@@ -6398,16 +6413,12 @@
     cls.add_constructor([param('ns3::WifiActionHeader::ActionValue const &', 'arg0')])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::blockAck [variable]
     cls.add_instance_attribute('blockAck', 'ns3::WifiActionHeader::BlockAckActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::interwork [variable]
-    cls.add_instance_attribute('interwork', 'ns3::WifiActionHeader::InterworkActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::linkMetrtic [variable]
-    cls.add_instance_attribute('linkMetrtic', 'ns3::WifiActionHeader::LinkMetricActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::pathSelection [variable]
-    cls.add_instance_attribute('pathSelection', 'ns3::WifiActionHeader::PathSelectionActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::peerLink [variable]
-    cls.add_instance_attribute('peerLink', 'ns3::WifiActionHeader::PeerLinkMgtActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::resourceCoordination [variable]
-    cls.add_instance_attribute('resourceCoordination', 'ns3::WifiActionHeader::ResourceCoordinationActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::meshAction [variable]
+    cls.add_instance_attribute('meshAction', 'ns3::WifiActionHeader::MeshActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::multihopAction [variable]
+    cls.add_instance_attribute('multihopAction', 'ns3::WifiActionHeader::MultihopActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::selfProtectedAction [variable]
+    cls.add_instance_attribute('selfProtectedAction', 'ns3::WifiActionHeader::SelfProtectedActionValue', is_const=False)
     return
 
 def register_Ns3WifiInformationElement_methods(root_module, cls):
@@ -7332,6 +7343,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -7805,10 +7820,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -7982,10 +7997,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
@@ -8072,18 +8087,18 @@
     cls.add_method('SetReceiveErrorCallback', 
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
-    ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
     ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxEndError(ns3::Ptr<ns3::Packet const> packet, double snr) [member function]
     cls.add_method('SwitchFromRxEndError', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'snr')])
-    ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxEndOk(ns3::Ptr<ns3::Packet> packet, double snr, ns3::WifiMode mode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxEndOk(ns3::Ptr<ns3::Packet> packet, double snr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('SwitchFromRxEndOk', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'snr'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble')])
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'snr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep(ns3::Time duration) [member function]
     cls.add_method('SwitchFromSleep', 
                    'void', 
@@ -8947,10 +8962,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxGain(double gain) [member function]
     cls.add_method('SetRxGain', 
@@ -8982,9 +8997,13 @@
     cls.add_method('SetTxPowerStart', 
                    'void', 
                    [param('double', 'start')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::StartReceivePacket(ns3::Ptr<ns3::Packet> packet, double rxPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, uint8_t packetType, ns3::Time rxDuration) [member function]
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::StartReceivePacket(ns3::Ptr<ns3::Packet> packet, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, uint8_t packetType, ns3::Ptr<ns3::InterferenceHelper::Event> event) [member function]
     cls.add_method('StartReceivePacket', 
                    'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble'), param('uint8_t', 'packetType'), param('ns3::Ptr< ns3::InterferenceHelper::Event >', 'event')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::StartReceivePlcp(ns3::Ptr<ns3::Packet> packet, double rxPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, uint8_t packetType, ns3::Time rxDuration) [member function]
+    cls.add_method('StartReceivePlcp', 
+                   'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble'), param('uint8_t', 'packetType'), param('ns3::Time', 'rxDuration')])
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::UnregisterListener(ns3::WifiPhyListener * listener) [member function]
     cls.add_method('UnregisterListener', 
@@ -11677,10 +11696,10 @@
     cls.add_method('CreateBlockAckAgreement', 
                    'void', 
                    [param('ns3::MgtAddBaResponseHeader const *', 'respHdr'), param('ns3::Mac48Address', 'originator'), param('uint16_t', 'startingSeq')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::DeaggregateAmpduAndReceive(ns3::Ptr<ns3::Packet> aggregatedPacket, double rxSnr, ns3::WifiMode txMode, ns3::WifiPreamble preamble) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::DeaggregateAmpduAndReceive(ns3::Ptr<ns3::Packet> aggregatedPacket, double rxSnr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('DeaggregateAmpduAndReceive', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble')])
+                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('double', 'rxSnr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
     ## mac-low.h (module 'wifi'): void ns3::MacLow::DestroyBlockAckAgreement(ns3::Mac48Address originator, uint8_t tid) [member function]
     cls.add_method('DestroyBlockAckAgreement', 
                    'void', 
@@ -11766,14 +11785,14 @@
     cls.add_method('ReceiveError', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'rxSnr')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveOk(ns3::Ptr<ns3::Packet> packet, double rxSnr, ns3::WifiMode txMode, ns3::WifiPreamble preamble, bool ampduSubframe) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveOk(ns3::Ptr<ns3::Packet> packet, double rxSnr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, bool ampduSubframe) [member function]
     cls.add_method('ReceiveOk', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble'), param('bool', 'ampduSubframe')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowBlockAckEventListener * listener) [member function]
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble'), param('bool', 'ampduSubframe')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowAggregationCapableTransmissionListener * listener) [member function]
     cls.add_method('RegisterBlockAckListenerForAc', 
                    'void', 
-                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
+                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowAggregationCapableTransmissionListener *', 'listener')])
     ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterDcfListener(ns3::MacLowDcfListener * listener) [member function]
     cls.add_method('RegisterDcfListener', 
                    'void', 
@@ -11851,8 +11870,8 @@
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters', 'parameters'), param('ns3::MacLowTransmissionListener *', 'listener')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): bool ns3::MacLow::StopAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
-    cls.add_method('StopAggregation', 
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::StopMpduAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
+    cls.add_method('StopMpduAggregation', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'peekedPacket'), param('ns3::WifiMacHeader', 'peekedHdr'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('uint16_t', 'size')], 
                    is_const=True)
diff -Naur ns-3.22/src/wifi/bindings/modulegen__gcc_LP64.py ns-3.23/src/wifi/bindings/modulegen__gcc_LP64.py
--- ns-3.22/src/wifi/bindings/modulegen__gcc_LP64.py	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/bindings/modulegen__gcc_LP64.py	2015-05-13 11:05:27.000000000 -0700
@@ -112,8 +112,8 @@
     module.add_class('Mac48Address', import_from_module='ns.network')
     ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
     root_module['ns3::Mac48Address'].implicitly_converts_to(root_module['ns3::Address'])
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener [class]
-    module.add_class('MacLowBlockAckEventListener', allow_subclassing=True)
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener [class]
+    module.add_class('MacLowAggregationCapableTransmissionListener', allow_subclassing=True)
     ## mac-low.h (module 'wifi'): ns3::MacLowDcfListener [class]
     module.add_class('MacLowDcfListener', allow_subclassing=True)
     ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener [class]
@@ -319,17 +319,13 @@
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader [class]
     module.add_class('WifiActionHeader', parent=root_module['ns3::Header'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::CategoryValue [enumeration]
-    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH_PEERING_MGT', 'MESH_LINK_METRIC', 'MESH_PATH_SELECTION', 'MESH_INTERWORKING', 'MESH_RESOURCE_COORDINATION', 'MESH_PROXY_FORWARDING', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PeerLinkMgtActionValue [enumeration]
-    module.add_enum('PeerLinkMgtActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::LinkMetricActionValue [enumeration]
-    module.add_enum('LinkMetricActionValue', ['LINK_METRIC_REQUEST', 'LINK_METRIC_REPORT'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::PathSelectionActionValue [enumeration]
-    module.add_enum('PathSelectionActionValue', ['PATH_SELECTION'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::InterworkActionValue [enumeration]
-    module.add_enum('InterworkActionValue', ['PORTAL_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'])
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ResourceCoordinationActionValue [enumeration]
-    module.add_enum('ResourceCoordinationActionValue', ['CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'BEACON_TIMING_REQUEST', 'BEACON_TIMING_RESPONSE', 'TBTT_ADJUSTMENT_REQUEST', 'MESH_CHANNEL_SWITCH_ANNOUNCEMENT'], outer_class=root_module['ns3::WifiActionHeader'])
+    module.add_enum('CategoryValue', ['BLOCK_ACK', 'MESH', 'MULTIHOP', 'SELF_PROTECTED', 'VENDOR_SPECIFIC_ACTION'], outer_class=root_module['ns3::WifiActionHeader'])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::SelfProtectedActionValue [enumeration]
+    module.add_enum('SelfProtectedActionValue', ['PEER_LINK_OPEN', 'PEER_LINK_CONFIRM', 'PEER_LINK_CLOSE', 'GROUP_KEY_INFORM', 'GROUP_KEY_ACK'], outer_class=root_module['ns3::WifiActionHeader'])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MultihopActionValue [enumeration]
+    module.add_enum('MultihopActionValue', ['PROXY_UPDATE', 'PROXY_UPDATE_CONFIRMATION'], outer_class=root_module['ns3::WifiActionHeader'])
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::MeshActionValue [enumeration]
+    module.add_enum('MeshActionValue', ['LINK_METRIC_REPORT', 'PATH_SELECTION', 'PORTAL_ANNOUNCEMENT', 'CONGESTION_CONTROL_NOTIFICATION', 'MDA_SETUP_REQUEST', 'MDA_SETUP_REPLY', 'MDAOP_ADVERTISMENT_REQUEST', 'MDAOP_ADVERTISMENTS', 'MDAOP_SET_TEARDOWN', 'TBTT_ADJUSTMENT_REQUEST', 'TBTT_ADJUSTMENT_RESPONSE'], outer_class=root_module['ns3::WifiActionHeader'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::BlockAckActionValue [enumeration]
     module.add_enum('BlockAckActionValue', ['BLOCK_ACK_ADDBA_REQUEST', 'BLOCK_ACK_ADDBA_RESPONSE', 'BLOCK_ACK_DELBA'], outer_class=root_module['ns3::WifiActionHeader'])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue [union]
@@ -706,7 +702,7 @@
     register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
     register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
     register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address'])
-    register_Ns3MacLowBlockAckEventListener_methods(root_module, root_module['ns3::MacLowBlockAckEventListener'])
+    register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, root_module['ns3::MacLowAggregationCapableTransmissionListener'])
     register_Ns3MacLowDcfListener_methods(root_module, root_module['ns3::MacLowDcfListener'])
     register_Ns3MacLowTransmissionListener_methods(root_module, root_module['ns3::MacLowTransmissionListener'])
     register_Ns3MacLowTransmissionParameters_methods(root_module, root_module['ns3::MacLowTransmissionParameters'])
@@ -2181,12 +2177,16 @@
     cls.add_constructor([param('ns3::InterferenceHelper const &', 'arg0')])
     ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::InterferenceHelper() [constructor]
     cls.add_constructor([])
-    ## interference-helper.h (module 'wifi'): ns3::Ptr<ns3::InterferenceHelper::Event> ns3::InterferenceHelper::Add(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble, ns3::Time duration, double rxPower, ns3::WifiTxVector txvector) [member function]
+    ## interference-helper.h (module 'wifi'): ns3::Ptr<ns3::InterferenceHelper::Event> ns3::InterferenceHelper::Add(uint32_t size, ns3::WifiTxVector txvector, ns3::WifiPreamble preamble, ns3::Time duration, double rxPower) [member function]
     cls.add_method('Add', 
                    'ns3::Ptr< ns3::InterferenceHelper::Event >', 
-                   [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble'), param('ns3::Time', 'duration'), param('double', 'rxPower'), param('ns3::WifiTxVector', 'txvector')])
-    ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::SnrPer ns3::InterferenceHelper::CalculateSnrPer(ns3::Ptr<ns3::InterferenceHelper::Event> event) [member function]
-    cls.add_method('CalculateSnrPer', 
+                   [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble'), param('ns3::Time', 'duration'), param('double', 'rxPower')])
+    ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::SnrPer ns3::InterferenceHelper::CalculatePlcpHeaderSnrPer(ns3::Ptr<ns3::InterferenceHelper::Event> event) [member function]
+    cls.add_method('CalculatePlcpHeaderSnrPer', 
+                   'ns3::InterferenceHelper::SnrPer', 
+                   [param('ns3::Ptr< ns3::InterferenceHelper::Event >', 'event')])
+    ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::SnrPer ns3::InterferenceHelper::CalculatePlcpPayloadSnrPer(ns3::Ptr<ns3::InterferenceHelper::Event> event) [member function]
+    cls.add_method('CalculatePlcpPayloadSnrPer', 
                    'ns3::InterferenceHelper::SnrPer', 
                    [param('ns3::Ptr< ns3::InterferenceHelper::Event >', 'event')])
     ## interference-helper.h (module 'wifi'): void ns3::InterferenceHelper::EraseEvents() [member function]
@@ -2736,67 +2736,82 @@
                    is_static=True)
     return
 
-def register_Ns3MacLowBlockAckEventListener_methods(root_module, cls):
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener(ns3::MacLowBlockAckEventListener const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::MacLowBlockAckEventListener const &', 'arg0')])
-    ## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener() [constructor]
+def register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, cls):
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener(ns3::MacLowAggregationCapableTransmissionListener const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::MacLowAggregationCapableTransmissionListener const &', 'arg0')])
+    ## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener() [constructor]
     cls.add_constructor([])
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
     cls.add_method('BlockAckInactivityTimeout', 
                    'void', 
                    [param('ns3::Mac48Address', 'originator'), param('uint8_t', 'tid')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
     cls.add_method('CompleteMpduTx', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader', 'hdr'), param('ns3::Time', 'tstamp')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
     cls.add_method('CompleteTransfer', 
                    'void', 
                    [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): bool ns3::MacLowBlockAckEventListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): bool ns3::MacLowAggregationCapableTransmissionListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
     cls.add_method('GetBlockAckAgreementExists', 
                    'bool', 
                    [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetDestAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('GetDestAddressForAggregation', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::MsduAggregator> ns3::MacLowAggregationCapableTransmissionListener::GetMsduAggregator() const [member function]
+    cls.add_method('GetMsduAggregator', 
+                   'ns3::Ptr< ns3::MsduAggregator >', 
+                   [], 
+                   is_const=True, is_virtual=True)
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
     cls.add_method('GetNOutstandingPackets', 
                    'uint32_t', 
                    [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+    ## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
     cls.add_method('GetNRetryNeededPackets', 
                    'uint32_t', 
                    [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')], 
                    is_const=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
     cls.add_method('GetNextSequenceNumberfor', 
                    'uint16_t', 
                    [param('ns3::WifiMacHeader *', 'hdr')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowBlockAckEventListener::GetQueue() [member function]
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowAggregationCapableTransmissionListener::GetQueue() [member function]
     cls.add_method('GetQueue', 
                    'ns3::Ptr< ns3::WifiMacQueue >', 
                    [], 
                    is_pure_virtual=True, is_virtual=True)
-    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowBlockAckEventListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
+    ## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetSrcAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+    cls.add_method('GetSrcAddressForAggregation', 
+                   'ns3::Mac48Address', 
+                   [param('ns3::WifiMacHeader const &', 'hdr')], 
+                   is_virtual=True)
+    ## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowAggregationCapableTransmissionListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
     cls.add_method('PeekNextPacketInBaQueue', 
                    'ns3::Ptr< ns3::Packet const >', 
                    [param('ns3::WifiMacHeader &', 'header'), param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::Time *', 'timestamp')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+    ## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
     cls.add_method('PeekNextSequenceNumberfor', 
                    'uint16_t', 
                    [param('ns3::WifiMacHeader *', 'hdr')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
     cls.add_method('RemoveFromBaQueue', 
                    'void', 
                    [param('uint8_t', 'tid'), param('ns3::Mac48Address', 'recipient'), param('uint16_t', 'seqnumber')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::SetAmpdu(bool ampdu) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::SetAmpdu(bool ampdu) [member function]
     cls.add_method('SetAmpdu', 
                    'void', 
                    [param('bool', 'ampdu')], 
@@ -6398,16 +6413,12 @@
     cls.add_constructor([param('ns3::WifiActionHeader::ActionValue const &', 'arg0')])
     ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::blockAck [variable]
     cls.add_instance_attribute('blockAck', 'ns3::WifiActionHeader::BlockAckActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::interwork [variable]
-    cls.add_instance_attribute('interwork', 'ns3::WifiActionHeader::InterworkActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::linkMetrtic [variable]
-    cls.add_instance_attribute('linkMetrtic', 'ns3::WifiActionHeader::LinkMetricActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::pathSelection [variable]
-    cls.add_instance_attribute('pathSelection', 'ns3::WifiActionHeader::PathSelectionActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::peerLink [variable]
-    cls.add_instance_attribute('peerLink', 'ns3::WifiActionHeader::PeerLinkMgtActionValue', is_const=False)
-    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::resourceCoordination [variable]
-    cls.add_instance_attribute('resourceCoordination', 'ns3::WifiActionHeader::ResourceCoordinationActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::meshAction [variable]
+    cls.add_instance_attribute('meshAction', 'ns3::WifiActionHeader::MeshActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::multihopAction [variable]
+    cls.add_instance_attribute('multihopAction', 'ns3::WifiActionHeader::MultihopActionValue', is_const=False)
+    ## mgt-headers.h (module 'wifi'): ns3::WifiActionHeader::ActionValue::selfProtectedAction [variable]
+    cls.add_instance_attribute('selfProtectedAction', 'ns3::WifiActionHeader::SelfProtectedActionValue', is_const=False)
     return
 
 def register_Ns3WifiInformationElement_methods(root_module, cls):
@@ -7332,6 +7343,10 @@
                    'int64_t', 
                    [param('int64_t', 'stream')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+    cls.add_method('CalculatePlcpDuration', 
+                   'ns3::Time', 
+                   [param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
     cls.add_method('CalculateSnr', 
                    'double', 
@@ -7805,10 +7820,10 @@
                    'ns3::WifiMode', 
                    [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
-    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
     cls.add_method('GetPlcpHtSigHeaderDuration', 
                    'ns3::Time', 
-                   [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], 
+                   [param('ns3::WifiPreamble', 'preamble')], 
                    is_static=True)
     ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
     cls.add_method('GetPlcpHtTrainingSymbolDuration', 
@@ -7982,10 +7997,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
-    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_pure_virtual=True, is_virtual=True)
     ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetSleepMode() [member function]
     cls.add_method('SetSleepMode', 
@@ -8072,18 +8087,18 @@
     cls.add_method('SetReceiveErrorCallback', 
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
-    ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')])
     ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxEndError(ns3::Ptr<ns3::Packet const> packet, double snr) [member function]
     cls.add_method('SwitchFromRxEndError', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'snr')])
-    ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxEndOk(ns3::Ptr<ns3::Packet> packet, double snr, ns3::WifiMode mode, ns3::WifiPreamble preamble) [member function]
+    ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromRxEndOk(ns3::Ptr<ns3::Packet> packet, double snr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('SwitchFromRxEndOk', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'snr'), param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble')])
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'snr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
     ## wifi-phy-state-helper.h (module 'wifi'): void ns3::WifiPhyStateHelper::SwitchFromSleep(ns3::Time duration) [member function]
     cls.add_method('SwitchFromSleep', 
                    'void', 
@@ -8947,10 +8962,10 @@
                    'void', 
                    [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, double, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_virtual=True)
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetReceiveOkCallback(ns3::Callback<void, ns3::Ptr<ns3::Packet>, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
     cls.add_method('SetReceiveOkCallback', 
                    'void', 
-                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiMode, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
+                   [param('ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::WifiPreamble, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
                    is_virtual=True)
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::SetRxGain(double gain) [member function]
     cls.add_method('SetRxGain', 
@@ -8982,9 +8997,13 @@
     cls.add_method('SetTxPowerStart', 
                    'void', 
                    [param('double', 'start')])
-    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::StartReceivePacket(ns3::Ptr<ns3::Packet> packet, double rxPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, uint8_t packetType, ns3::Time rxDuration) [member function]
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::StartReceivePacket(ns3::Ptr<ns3::Packet> packet, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, uint8_t packetType, ns3::Ptr<ns3::InterferenceHelper::Event> event) [member function]
     cls.add_method('StartReceivePacket', 
                    'void', 
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble'), param('uint8_t', 'packetType'), param('ns3::Ptr< ns3::InterferenceHelper::Event >', 'event')])
+    ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::StartReceivePlcp(ns3::Ptr<ns3::Packet> packet, double rxPowerDbm, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, uint8_t packetType, ns3::Time rxDuration) [member function]
+    cls.add_method('StartReceivePlcp', 
+                   'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxPowerDbm'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble'), param('uint8_t', 'packetType'), param('ns3::Time', 'rxDuration')])
     ## yans-wifi-phy.h (module 'wifi'): void ns3::YansWifiPhy::UnregisterListener(ns3::WifiPhyListener * listener) [member function]
     cls.add_method('UnregisterListener', 
@@ -11677,10 +11696,10 @@
     cls.add_method('CreateBlockAckAgreement', 
                    'void', 
                    [param('ns3::MgtAddBaResponseHeader const *', 'respHdr'), param('ns3::Mac48Address', 'originator'), param('uint16_t', 'startingSeq')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::DeaggregateAmpduAndReceive(ns3::Ptr<ns3::Packet> aggregatedPacket, double rxSnr, ns3::WifiMode txMode, ns3::WifiPreamble preamble) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::DeaggregateAmpduAndReceive(ns3::Ptr<ns3::Packet> aggregatedPacket, double rxSnr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble) [member function]
     cls.add_method('DeaggregateAmpduAndReceive', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble')])
+                   [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('double', 'rxSnr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble')])
     ## mac-low.h (module 'wifi'): void ns3::MacLow::DestroyBlockAckAgreement(ns3::Mac48Address originator, uint8_t tid) [member function]
     cls.add_method('DestroyBlockAckAgreement', 
                    'void', 
@@ -11766,14 +11785,14 @@
     cls.add_method('ReceiveError', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'rxSnr')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveOk(ns3::Ptr<ns3::Packet> packet, double rxSnr, ns3::WifiMode txMode, ns3::WifiPreamble preamble, bool ampduSubframe) [member function]
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveOk(ns3::Ptr<ns3::Packet> packet, double rxSnr, ns3::WifiTxVector txVector, ns3::WifiPreamble preamble, bool ampduSubframe) [member function]
     cls.add_method('ReceiveOk', 
                    'void', 
-                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble'), param('bool', 'ampduSubframe')])
-    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowBlockAckEventListener * listener) [member function]
+                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiTxVector', 'txVector'), param('ns3::WifiPreamble', 'preamble'), param('bool', 'ampduSubframe')])
+    ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowAggregationCapableTransmissionListener * listener) [member function]
     cls.add_method('RegisterBlockAckListenerForAc', 
                    'void', 
-                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
+                   [param('ns3::AcIndex', 'ac'), param('ns3::MacLowAggregationCapableTransmissionListener *', 'listener')])
     ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterDcfListener(ns3::MacLowDcfListener * listener) [member function]
     cls.add_method('RegisterDcfListener', 
                    'void', 
@@ -11851,8 +11870,8 @@
                    'void', 
                    [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters', 'parameters'), param('ns3::MacLowTransmissionListener *', 'listener')], 
                    is_virtual=True)
-    ## mac-low.h (module 'wifi'): bool ns3::MacLow::StopAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
-    cls.add_method('StopAggregation', 
+    ## mac-low.h (module 'wifi'): bool ns3::MacLow::StopMpduAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
+    cls.add_method('StopMpduAggregation', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet const >', 'peekedPacket'), param('ns3::WifiMacHeader', 'peekedHdr'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('uint16_t', 'size')], 
                    is_const=True)
diff -Naur ns-3.22/src/wifi/doc/wifi.rst ns-3.23/src/wifi/doc/wifi.rst
--- ns-3.22/src/wifi/doc/wifi.rst	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/doc/wifi.rst	2015-05-13 11:05:27.000000000 -0700
@@ -19,7 +19,7 @@
 
 * basic 802.11 DCF with **infrastructure** and **adhoc** modes
 * **802.11a**, **802.11b**, **802.11g** and **802.11n** (both 2.4 and 5 GHz bands) physical layers
-* **MSDU aggregation** and **MPDU aggregation** extensions of 802.11n
+* **MSDU aggregation** and **MPDU aggregation** extensions of 802.11n, and both can be combined together (two-level aggregation)
 * QoS-based EDCA and queueing extensions of **802.11e**
 * the ability to use different propagation loss models and propagation delay models,
   please see the chapter on :ref:`Propagation` for more detail
@@ -733,8 +733,12 @@
 * PHY_RXSTART is not supported
 * 802.11e TXOP is not supported
 * 802.11n MIMO is not supported
-* hybrid aggregation is not supported
-
+* PLCP preamble reception is not modeled
+* BSSBasicRateSet for 802.11b has been assumed to be 1-2 Mbit/s
+* BSSBasicRateSet for 802.11a has been assumed to be 6-12-24 Mbit/s
+* cases where RTS/CTS and ACK are transmitted using HT formats are not
+supported
+* rate control algorithms are not aware of HT rates; they will only use the 802.11a BSSBasicRateSet when 802.11n is configured
 
 Wifi Tracing
 ************
@@ -771,4 +775,4 @@
 
 .. [akella2007parf] \ A. Akella, G. Judd, S. Seshan, and P. Steenkiste, 'Self-management in chaotic wireless deployments', in Wireless Networks, Kluwer Academic Publishers, 2007, 13, 737-755.  `<http://www.cs.odu.edu/~nadeem/classes/cs795-WNS-S13/papers/enter-006.pdf>`__
 
-.. [chevillat2005aparf] \  Chevillat, P.; Jelitto, J., and Truong, H. L., 'Dynamic data rate and transmit power adjustment in IEEE 802.11 wireless LANs', in International Journal of Wireless Information Networks, Springer, 2005, 12, 123-145.  `<http://www.cs.mun.ca/~yzchen/papers/papers/rate_adaptation/80211_dynamic_rate_power_adjustment_chevillat_j2005.pdf>`__
\ No newline at end of file
+.. [chevillat2005aparf] \  Chevillat, P.; Jelitto, J., and Truong, H. L., 'Dynamic data rate and transmit power adjustment in IEEE 802.11 wireless LANs', in International Journal of Wireless Information Networks, Springer, 2005, 12, 123-145.  `<http://www.cs.mun.ca/~yzchen/papers/papers/rate_adaptation/80211_dynamic_rate_power_adjustment_chevillat_j2005.pdf>`__
diff -Naur ns-3.22/src/wifi/examples/wifi-phy-test.cc ns-3.23/src/wifi/examples/wifi-phy-test.cc
--- ns-3.22/src/wifi/examples/wifi-phy-test.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/examples/wifi-phy-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -59,7 +59,7 @@
 
 private:
   void Send (void);
-  void Receive (Ptr<Packet> p, double snr, WifiMode mode, enum WifiPreamble preamble);
+  void Receive (Ptr<Packet> p, double snr, WifiTxVector txVector, enum WifiPreamble preamble);
   Ptr<WifiPhy> m_tx;
   struct Input m_input;
   struct Output m_output;
@@ -77,7 +77,7 @@
 }
 
 void
-PsrExperiment::Receive (Ptr<Packet> p, double snr, WifiMode mode, enum WifiPreamble preamble)
+PsrExperiment::Receive (Ptr<Packet> p, double snr, WifiTxVector txVector, enum WifiPreamble preamble)
 {
   m_output.received++;
 }
@@ -161,7 +161,7 @@
 private:
   void SendA (void) const;
   void SendB (void) const;
-  void Receive (Ptr<Packet> p, double snr, WifiMode mode, enum WifiPreamble preamble);
+  void Receive (Ptr<Packet> p, double snr, WifiTxVector txVector, enum WifiPreamble preamble);
   Ptr<WifiPhy> m_txA;
   Ptr<WifiPhy> m_txB;
   uint32_t m_flowIdA;
@@ -193,7 +193,7 @@
 }
 
 void
-CollisionExperiment::Receive (Ptr<Packet> p, double snr, WifiMode mode, enum WifiPreamble preamble)
+CollisionExperiment::Receive (Ptr<Packet> p, double snr, WifiTxVector txVector, enum WifiPreamble preamble)
 {
   FlowIdTag tag;
   if (p->FindFirstMatchingByteTag (tag))
diff -Naur ns-3.22/src/wifi/helper/athstats-helper.cc ns-3.23/src/wifi/helper/athstats-helper.cc
--- ns-3.22/src/wifi/helper/athstats-helper.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/helper/athstats-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -111,6 +111,7 @@
 {
   static TypeId tid = TypeId ("ns3::AthstatsWifiTraceSink")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AthstatsWifiTraceSink> ()
     .AddAttribute ("Interval",
                    "Time interval between reports",
diff -Naur ns-3.22/src/wifi/model/aarfcd-wifi-manager.cc ns-3.23/src/wifi/model/aarfcd-wifi-manager.cc
--- ns-3.22/src/wifi/model/aarfcd-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/aarfcd-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -66,6 +66,7 @@
 {
   static TypeId tid = TypeId ("ns3::AarfcdWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AarfcdWifiManager> ()
     .AddAttribute ("SuccessK", "Multiplication factor for the success threshold in the AARF algorithm.",
                    DoubleValue (2.0),
diff -Naur ns-3.22/src/wifi/model/aarf-wifi-manager.cc ns-3.23/src/wifi/model/aarf-wifi-manager.cc
--- ns-3.22/src/wifi/model/aarf-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/aarf-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::AarfWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AarfWifiManager> ()
     .AddAttribute ("SuccessK", "Multiplication factor for the success threshold in the AARF algorithm.",
                    DoubleValue (2.0),
diff -Naur ns-3.22/src/wifi/model/adhoc-wifi-mac.cc ns-3.23/src/wifi/model/adhoc-wifi-mac.cc
--- ns-3.22/src/wifi/model/adhoc-wifi-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/adhoc-wifi-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -47,6 +47,7 @@
 {
   static TypeId tid = TypeId ("ns3::AdhocWifiMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AdhocWifiMac> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/ampdu-subframe-header.cc ns-3.23/src/wifi/model/ampdu-subframe-header.cc
--- ns-3.22/src/wifi/model/ampdu-subframe-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/ampdu-subframe-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -29,6 +29,7 @@
 {
   static TypeId tid = TypeId ("ns3::AmpduSubframeHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AmpduSubframeHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/ampdu-tag.cc ns-3.23/src/wifi/model/ampdu-tag.cc
--- ns-3.22/src/wifi/model/ampdu-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/ampdu-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::AmpduTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AmpduTag> ()
     .AddAttribute ("Ampdu Exists", "The value that indicates that the packet contains an AMPDU",
                    UintegerValue (false),
diff -Naur ns-3.22/src/wifi/model/amrr-wifi-manager.cc ns-3.23/src/wifi/model/amrr-wifi-manager.cc
--- ns-3.22/src/wifi/model/amrr-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/amrr-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -57,6 +57,7 @@
 {
   static TypeId tid = TypeId ("ns3::AmrrWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AmrrWifiManager> ()
     .AddAttribute ("UpdatePeriod",
                    "The interval between decisions about rate control changes",
diff -Naur ns-3.22/src/wifi/model/amsdu-subframe-header.cc ns-3.23/src/wifi/model/amsdu-subframe-header.cc
--- ns-3.22/src/wifi/model/amsdu-subframe-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/amsdu-subframe-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,6 +32,7 @@
 {
   static TypeId tid = TypeId ("ns3::AmsduSubframeHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AmsduSubframeHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/aparf-wifi-manager.cc ns-3.23/src/wifi/model/aparf-wifi-manager.cc
--- ns-3.22/src/wifi/model/aparf-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/aparf-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -61,6 +61,7 @@
 {
   static TypeId tid = TypeId ("ns3::AparfWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<AparfWifiManager> ()
     .AddAttribute ("SuccessThreshold 1",
                    "The minimum number of successful transmissions in \"High\" state to try a new power or rate.",
diff -Naur ns-3.22/src/wifi/model/ap-wifi-mac.cc ns-3.23/src/wifi/model/ap-wifi-mac.cc
--- ns-3.22/src/wifi/model/ap-wifi-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/ap-wifi-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -49,6 +49,7 @@
 {
   static TypeId tid = TypeId ("ns3::ApWifiMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<ApWifiMac> ()
     .AddAttribute ("BeaconInterval", "Delay between two beacons",
                    TimeValue (MicroSeconds (102400)),
@@ -313,6 +314,14 @@
     {
       WifiMode mode = m_phy->GetMode (i);
       rates.AddSupportedRate (mode.GetDataRate ());
+      // add rates that are part of the BSSBasicRateSet (manufacturer dependent!)
+      // here we choose to add the mandatory rates to the BSSBasicRateSet,
+      // exept for 802.11b where we assume that only the two lowest mandatory rates are part of the BSSBasicRateSet
+      if (mode.IsMandatory() &&
+         ((mode.GetModulationClass () != WIFI_MOD_CLASS_DSSS) || mode == WifiPhy::GetDsssRate1Mbps () || mode == WifiPhy::GetDsssRate2Mbps ()))
+      {
+        m_stationManager->AddBasicMode (mode);
+      }
     }
   // set the basic rates
   for (uint32_t j = 0; j < m_stationManager->GetNBasicModes (); j++)
diff -Naur ns-3.22/src/wifi/model/arf-wifi-manager.cc ns-3.23/src/wifi/model/arf-wifi-manager.cc
--- ns-3.22/src/wifi/model/arf-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/arf-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -56,6 +56,7 @@
 {
   static TypeId tid = TypeId ("ns3::ArfWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<ArfWifiManager> ()
     .AddAttribute ("TimerThreshold", "The 'timer' threshold in the ARF algorithm.",
                    UintegerValue (15),
diff -Naur ns-3.22/src/wifi/model/cara-wifi-manager.cc ns-3.23/src/wifi/model/cara-wifi-manager.cc
--- ns-3.22/src/wifi/model/cara-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/cara-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -52,6 +52,7 @@
 {
   static TypeId tid = TypeId ("ns3::CaraWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<CaraWifiManager> ()
     .AddAttribute ("ProbeThreshold",
                    "The number of consecutive transmissions failure to activate the RTS probe.",
diff -Naur ns-3.22/src/wifi/model/constant-rate-wifi-manager.cc ns-3.23/src/wifi/model/constant-rate-wifi-manager.cc
--- ns-3.22/src/wifi/model/constant-rate-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/constant-rate-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,12 +37,13 @@
 {
   static TypeId tid = TypeId ("ns3::ConstantRateWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<ConstantRateWifiManager> ()
     .AddAttribute ("DataMode", "The transmission mode to use for every data packet transmission",
                    StringValue ("OfdmRate6Mbps"),
                    MakeWifiModeAccessor (&ConstantRateWifiManager::m_dataMode),
                    MakeWifiModeChecker ())
-    .AddAttribute ("ControlMode", "The transmission mode to use for every control packet transmission.",
+    .AddAttribute ("ControlMode", "The transmission mode to use for every RTS packet transmission.",
                    StringValue ("OfdmRate6Mbps"),
                    MakeWifiModeAccessor (&ConstantRateWifiManager::m_ctlMode),
                    MakeWifiModeChecker ())
diff -Naur ns-3.22/src/wifi/model/constant-rate-wifi-manager.h ns-3.23/src/wifi/model/constant-rate-wifi-manager.h
--- ns-3.22/src/wifi/model/constant-rate-wifi-manager.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/constant-rate-wifi-manager.h	2015-05-13 11:05:27.000000000 -0700
@@ -28,7 +28,7 @@
 
 /**
  * \ingroup wifi
- * \brief use constant rates for data and control transmissions
+ * \brief use constant rates for data and RTS transmissions
  *
  * This class uses always the same transmission rate for every
  * packet sent.
@@ -58,7 +58,7 @@
   virtual bool IsLowLatency (void) const;
 
   WifiMode m_dataMode; //!< Wifi mode for unicast DATA frames
-  WifiMode m_ctlMode; //!< Wifi mode for request control frames
+  WifiMode m_ctlMode; //!< Wifi mode for RTS frames
 };
 
 } // namespace ns3
diff -Naur ns-3.22/src/wifi/model/ctrl-headers.cc ns-3.23/src/wifi/model/ctrl-headers.cc
--- ns-3.22/src/wifi/model/ctrl-headers.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/ctrl-headers.cc	2015-05-13 11:05:27.000000000 -0700
@@ -51,6 +51,7 @@
   NS_LOG_FUNCTION_NOARGS ();
   static TypeId tid = TypeId ("ns3::CtrlBAckRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<CtrlBAckRequestHeader> ()
   ;
   return tid;
@@ -299,6 +300,7 @@
 {
   static TypeId tid = TypeId ("ns3::CtrlBAckResponseHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<CtrlBAckResponseHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/dca-txop.cc ns-3.23/src/wifi/model/dca-txop.cc
--- ns-3.22/src/wifi/model/dca-txop.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/dca-txop.cc	2015-05-13 11:05:27.000000000 -0700
@@ -135,6 +135,7 @@
 {
   static TypeId tid = TypeId ("ns3::DcaTxop")
     .SetParent (ns3::Dcf::GetTypeId ())
+    .SetGroupName ("Wifi")
     .AddConstructor<DcaTxop> ()
     .AddAttribute ("Queue", "The WifiMacQueue object",
                    PointerValue (),
diff -Naur ns-3.22/src/wifi/model/edca-txop-n.cc ns-3.23/src/wifi/model/edca-txop-n.cc
--- ns-3.22/src/wifi/model/edca-txop-n.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/edca-txop-n.cc	2015-05-13 11:05:27.000000000 -0700
@@ -132,14 +132,14 @@
   EdcaTxopN *m_txop;
 };
 
-class EdcaTxopN::BlockAckEventListener : public MacLowBlockAckEventListener
+class EdcaTxopN::AggregationCapableTransmissionListener : public MacLowAggregationCapableTransmissionListener
 {
 public:
-  BlockAckEventListener (EdcaTxopN * txop)
-    : MacLowBlockAckEventListener (),
+  AggregationCapableTransmissionListener (EdcaTxopN * txop)
+    : MacLowAggregationCapableTransmissionListener (),
       m_txop (txop) {
   }
-  virtual ~BlockAckEventListener () {}
+  virtual ~AggregationCapableTransmissionListener () {}
 
   virtual void BlockAckInactivityTimeout (Mac48Address address, uint8_t tid)
   {
@@ -189,6 +189,18 @@
   {
     return m_txop->GetNRetryNeededPackets (recipient, tid);
   }
+  virtual Ptr<MsduAggregator> GetMsduAggregator (void) const
+  { 
+    return m_txop->GetMsduAggregator ();
+  }
+  virtual Mac48Address GetSrcAddressForAggregation (const WifiMacHeader &hdr)
+  {
+    return m_txop->MapSrcAddressForAggregation (hdr);
+  }
+  virtual Mac48Address GetDestAddressForAggregation (const WifiMacHeader &hdr)
+  {
+    return m_txop->MapDestAddressForAggregation (hdr);
+  }
 
 private:
   EdcaTxopN *m_txop;
@@ -201,6 +213,7 @@
 {
   static TypeId tid = TypeId ("ns3::EdcaTxopN")
     .SetParent (ns3::Dcf::GetTypeId ())
+    .SetGroupName ("Wifi")
     .AddConstructor<EdcaTxopN> ()
     .AddAttribute ("BlockAckThreshold", "If number of packets in this queue reaches this value,\
                                          block ack mechanism is used. If this value is 0, block ack is never used.",
@@ -227,12 +240,13 @@
   : m_manager (0),
     m_currentPacket (0),
     m_aggregator (0),
+    m_typeOfStation (STA),
     m_blockAckType (COMPRESSED_BLOCK_ACK),
     m_ampduExist (false)
 {
   NS_LOG_FUNCTION (this);
   m_transmissionListener = new EdcaTxopN::TransmissionListener (this);
-  m_blockAckListener = new EdcaTxopN::BlockAckEventListener (this);
+  m_blockAckListener = new EdcaTxopN::AggregationCapableTransmissionListener (this);
   m_dcf = new EdcaTxopN::Dcf (this);
   m_queue = CreateObject<WifiMacQueue> ();
   m_rng = new RealRandomStream ();
@@ -646,9 +660,35 @@
       if (GetAmpduExist())
         {
           m_low->FlushAggregateQueue ();
+          
+          NS_LOG_DEBUG ("Transmit Block Ack Request");
+          CtrlBAckRequestHeader reqHdr;
+          reqHdr.SetType (COMPRESSED_BLOCK_ACK);
+          uint8_t tid = m_currentHdr.GetQosTid ();
+          reqHdr.SetStartingSequence (m_txMiddle->PeekNextSequenceNumberfor (&m_currentHdr));
+          reqHdr.SetTidInfo (tid);
+          reqHdr.SetHtImmediateAck(true);
+          Ptr<Packet> bar = Create<Packet> ();
+          bar->AddHeader (reqHdr);
+          Bar request (bar, m_currentHdr.GetAddr1 (), tid, reqHdr.MustSendHtImmediateAck());
+          m_currentBar = request;
+          WifiMacHeader hdr;
+          hdr.SetType (WIFI_MAC_CTL_BACKREQ);
+          hdr.SetAddr1 (request.recipient);
+          hdr.SetAddr2 (m_low->GetAddress ());
+          hdr.SetAddr3 (m_low->GetBssid ());
+          hdr.SetDsNotTo ();
+          hdr.SetDsNotFrom ();
+          hdr.SetNoRetry ();
+          hdr.SetNoMoreFragments ();
+          m_currentPacket = request.bar;
+          m_currentHdr = hdr;
+        }
+      else
+        {
+          m_currentPacket = 0;
         }
       // to reset the dcf.
-      m_currentPacket = 0;
       m_dcf->ResetCw ();
     }
   else
diff -Naur ns-3.22/src/wifi/model/edca-txop-n.h ns-3.23/src/wifi/model/edca-txop-n.h
--- ns-3.22/src/wifi/model/edca-txop-n.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/edca-txop-n.h	2015-05-13 11:05:27.000000000 -0700
@@ -507,7 +507,7 @@
   AcIndex m_ac;
   class Dcf;
   class TransmissionListener;
-  class BlockAckEventListener;
+  class AggregationCapableTransmissionListener;
   friend class Dcf;
   friend class TransmissionListener;
   Dcf *m_dcf;
@@ -518,7 +518,7 @@
   Ptr<MacLow> m_low;
   MacTxMiddle *m_txMiddle;
   TransmissionListener *m_transmissionListener;
-  BlockAckEventListener *m_blockAckListener;
+  AggregationCapableTransmissionListener *m_blockAckListener;
   RandomStream *m_rng;
   Ptr<WifiRemoteStationManager> m_stationManager;
   uint8_t m_fragmentNumber;
diff -Naur ns-3.22/src/wifi/model/error-rate-model.cc ns-3.23/src/wifi/model/error-rate-model.cc
--- ns-3.22/src/wifi/model/error-rate-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/error-rate-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -27,6 +27,7 @@
 {
   static TypeId tid = TypeId ("ns3::ErrorRateModel")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/wifi/model/ideal-wifi-manager.cc ns-3.23/src/wifi/model/ideal-wifi-manager.cc
--- ns-3.22/src/wifi/model/ideal-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/ideal-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::IdealWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<IdealWifiManager> ()
     .AddAttribute ("BerThreshold",
                    "The maximum Bit Error Rate acceptable at any transmission mode",
diff -Naur ns-3.22/src/wifi/model/interference-helper.cc ns-3.23/src/wifi/model/interference-helper.cc
--- ns-3.22/src/wifi/model/interference-helper.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/interference-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,16 +32,15 @@
  *       Phy event class
  ****************************************************************/
 
-InterferenceHelper::Event::Event (uint32_t size, WifiMode payloadMode,
+InterferenceHelper::Event::Event (uint32_t size, WifiTxVector txVector,
                                   enum WifiPreamble preamble,
-                                  Time duration, double rxPower, WifiTxVector txVector)
+                                  Time duration, double rxPower)
   : m_size (size),
-    m_payloadMode (payloadMode),
+    m_txVector (txVector),
     m_preamble (preamble),
     m_startTime (Simulator::Now ()),
     m_endTime (m_startTime + duration),
-    m_rxPowerW (rxPower),
-    m_txVector (txVector)
+    m_rxPowerW (rxPower)
 {
 }
 InterferenceHelper::Event::~Event ()
@@ -73,10 +72,15 @@
 {
   return m_size;
 }
+WifiTxVector
+InterferenceHelper::Event::GetTxVector (void) const
+{
+  return m_txVector;
+}
 WifiMode
 InterferenceHelper::Event::GetPayloadMode (void) const
 {
-  return m_payloadMode;
+  return m_txVector.GetMode();
 }
 enum WifiPreamble
 InterferenceHelper::Event::GetPreambleType (void) const
@@ -84,12 +88,6 @@
   return m_preamble;
 }
 
-WifiTxVector
-InterferenceHelper::Event::GetTxVector (void) const
-{
-  return m_txVector;
-}
-
 
 /****************************************************************
  *       Class which records SNIR change events for a
@@ -134,18 +132,17 @@
 }
 
 Ptr<InterferenceHelper::Event>
-InterferenceHelper::Add (uint32_t size, WifiMode payloadMode,
+InterferenceHelper::Add (uint32_t size, WifiTxVector txVector,
                          enum WifiPreamble preamble,
-                         Time duration, double rxPowerW, WifiTxVector txVector)
+                         Time duration, double rxPowerW)
 {
   Ptr<InterferenceHelper::Event> event;
 
   event = Create<InterferenceHelper::Event> (size,
-                                             payloadMode,
+                                             txVector,
                                              preamble,
                                              duration,
-                                             rxPowerW,
-                                             txVector);
+                                             rxPowerW);
   AppendEvent (event);
   return event;
 }
@@ -267,23 +264,16 @@
 }
 
 double
-InterferenceHelper::CalculatePer (Ptr<const InterferenceHelper::Event> event, NiChanges *ni) const
+InterferenceHelper::CalculatePlcpPayloadPer (Ptr<const InterferenceHelper::Event> event, NiChanges *ni) const
 {
   double psr = 1.0; /* Packet Success Rate */
   NiChanges::iterator j = ni->begin ();
   Time previous = (*j).GetTime ();
   WifiMode payloadMode = event->GetPayloadMode ();
   WifiPreamble preamble = event->GetPreambleType ();
- WifiMode MfHeaderMode ;
- if (preamble==WIFI_PREAMBLE_HT_MF)
-   {
-    MfHeaderMode = WifiPhy::GetMFPlcpHeaderMode (payloadMode, preamble); //return L-SIG mode
-
-   }
-  WifiMode headerMode = WifiPhy::GetPlcpHeaderMode (payloadMode, preamble);
   Time plcpHeaderStart = (*j).GetTime () + WifiPhy::GetPlcpPreambleDuration (payloadMode, preamble); //packet start time+ preamble
   Time plcpHsigHeaderStart = plcpHeaderStart + WifiPhy::GetPlcpHeaderDuration (payloadMode, preamble);//packet start time+ preamble+L SIG
-  Time plcpHtTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (payloadMode, preamble);//packet start time+ preamble+L SIG+HT SIG
+  Time plcpHtTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (preamble);//packet start time+ preamble+L SIG+HT SIG
   Time plcpPayloadStart =plcpHtTrainingSymbolsStart + WifiPhy::GetPlcpHtTrainingSymbolDuration (preamble,event->GetTxVector()); //packet start time+ preamble+L SIG+HT SIG+Training
   double noiseInterferenceW = (*j).GetDelta ();
   double powerW = event->GetRxPowerW ();
@@ -309,74 +299,143 @@
             { 
                //Case 2ai and 2aii: All formats
                psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
-                                                              noiseInterferenceW,
-                                                              payloadMode),
-                                                current - plcpPayloadStart,
-                                                payloadMode);
+                                                               noiseInterferenceW,
+                                                               payloadMode),
+                                                 current - plcpPayloadStart,
+                                                 payloadMode);
                 
-              }
+            }
         }
       //Case 3: previous is in HT-SIG: Non HT will not enter here since it didn't enter in the last two and they are all the same for non HT
-      else if (previous >=plcpHsigHeaderStart)
+      else if (previous >= plcpHsigHeaderStart)
         {
           //Case 3a: cuurent after payload start
-          if (current >=plcpPayloadStart)
+          if (current >= plcpPayloadStart)
              {
                    psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
+                                                                   noiseInterferenceW,
+                                                                   payloadMode),
+                                                     current - plcpPayloadStart,
+                                                     payloadMode);
+                 
+              }
+
+        }
+      //Case 4: previous in L-SIG: GF will not reach here because it will execute the previous if and exit
+      else if (previous >= plcpHeaderStart)
+        {
+          //Case 4a: current after payload start  
+          if (current >= plcpPayloadStart)
+             {
+                   psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
+                                                                   noiseInterferenceW,
+                                                                   payloadMode),
+                                                     current - plcpPayloadStart,
+                                                     payloadMode);
+
+              }
+        }
+      //Case 5: previous is in the preamble works for all cases
+      else
+        {
+          if (current >= plcpPayloadStart)
+            {
+              //for all
+              psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                               noiseInterferenceW,
                                                               payloadMode),
                                                 current - plcpPayloadStart,
-                                                payloadMode);
+                                                payloadMode); 
+             
+            }
+        }
+
+      noiseInterferenceW += (*j).GetDelta ();
+      previous = (*j).GetTime ();
+      j++;
+    }
+
+  double per = 1 - psr;
+  return per;
+}
+
+double
+InterferenceHelper::CalculatePlcpHeaderPer (Ptr<const InterferenceHelper::Event> event, NiChanges *ni) const
+{
+  double psr = 1.0; /* Packet Success Rate */
+  NiChanges::iterator j = ni->begin ();
+  Time previous = (*j).GetTime ();
+  WifiMode payloadMode = event->GetPayloadMode ();
+  WifiPreamble preamble = event->GetPreambleType ();
+  WifiMode MfHeaderMode ;
+  if (preamble == WIFI_PREAMBLE_HT_MF)
+    {
+      MfHeaderMode = WifiPhy::GetMFPlcpHeaderMode (payloadMode, preamble); //return L-SIG mode
+    }
+  WifiMode headerMode = WifiPhy::GetPlcpHeaderMode (payloadMode, preamble);
+  Time plcpHeaderStart = (*j).GetTime () + WifiPhy::GetPlcpPreambleDuration (payloadMode, preamble); // packet start time + preamble
+  Time plcpHsigHeaderStart = plcpHeaderStart + WifiPhy::GetPlcpHeaderDuration (payloadMode, preamble); // packet start time + preamble+L SIG
+  Time plcpHtTrainingSymbolsStart = plcpHsigHeaderStart + WifiPhy::GetPlcpHtSigHeaderDuration (preamble); // packet start time + preamble + L SIG + HT SIG
+  Time plcpPayloadStart = plcpHtTrainingSymbolsStart + WifiPhy::GetPlcpHtTrainingSymbolDuration (preamble, event->GetTxVector()); // packet start time + preamble + L SIG + HT SIG + Training
+  double noiseInterferenceW = (*j).GetDelta ();
+  double powerW = event->GetRxPowerW ();
+    j++;
+  while (ni->end () != j)
+    {
+      Time current = (*j).GetTime ();
+      NS_ASSERT (current >= previous);
+      //Case 1: previous is in HT-SIG: Non HT will not enter here since it didn't enter in the last two and they are all the same for non HT
+      if (previous >= plcpHsigHeaderStart)
+        {
+          //Case 1a: cuurent after payload start
+          if (current >= plcpPayloadStart)
+             {
+
                  
                     psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
-                                                              noiseInterferenceW,
-                                                              headerMode),
-                                               plcpHtTrainingSymbolsStart - previous,
-                                                headerMode);
+                                                                    noiseInterferenceW,
+                                                                    headerMode),
+                                                      plcpHtTrainingSymbolsStart - previous,
+                                                      headerMode);
               }
-          //case 3b: current after HT training symbols start
+          //case 1b: current after HT training symbols start
           else if (current >=plcpHtTrainingSymbolsStart)
              {
                 psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                                 noiseInterferenceW,
                                                                 headerMode),
-                                                   plcpHtTrainingSymbolsStart - previous,
-                                                   headerMode);  
+                                                  plcpHtTrainingSymbolsStart - previous,
+                                                  headerMode);
                    
              }
-         //Case 3c: current is with previous in HT sig
+         //Case 1c: current is with previous in HT sig
          else
             {
                 psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                                 noiseInterferenceW,
                                                                 headerMode),
-                                                   current- previous,
-                                                   headerMode);  
+                                                  current - previous,
+                                                  headerMode);
                    
             }
       }
-      //Case 4: previous in L-SIG: GF will not reach here because it will execute the previous if and exit
+      // Case 2: previous in L-SIG: GF will not reach here because it will execute the previous if and exit
       else if (previous >= plcpHeaderStart)
         {
-          //Case 4a: current after payload start  
-          if (current >=plcpPayloadStart)
+          // Case 2a: current after payload start
+          if (current >= plcpPayloadStart)
              {
-                   psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
-                                                              noiseInterferenceW,
-                                                              payloadMode),
-                                                      current - plcpPayloadStart,
-                                                      payloadMode);
-                    //Case 4ai: Non HT format (No HT-SIG or Training Symbols)
+              // Case 2ai: Non HT format (No HT-SIG or Training Symbols)
               if (preamble == WIFI_PREAMBLE_LONG || preamble == WIFI_PREAMBLE_SHORT) //plcpHtTrainingSymbolsStart==plcpHeaderStart)
                 {
                     psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
-                                                              noiseInterferenceW,
-                                                              headerMode),
-                                                plcpPayloadStart - previous,
-                                                headerMode);
+                                                                    noiseInterferenceW,
+                                                                    headerMode),
+                                                      plcpPayloadStart - previous,
+                                                      headerMode);
                 }
-
-               else{
+              else
+                {
                     psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                               noiseInterferenceW,
                                                               headerMode),
@@ -389,8 +448,8 @@
                                                       MfHeaderMode);
                  }
               }
-           //Case 4b: current in HT training symbol. non HT will not come here since it went in previous if or if the previous ifis not true this will be not true        
-          else if (current >=plcpHtTrainingSymbolsStart)
+          // Case 2b: current in HT training symbol. non HT will not come here since it went in previous if or if the previous ifis not true this will be not true
+          else if (current >= plcpHtTrainingSymbolsStart)
              {
                 psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                               noiseInterferenceW,
@@ -403,8 +462,8 @@
                                                    plcpHsigHeaderStart - previous,
                                                    MfHeaderMode);
               }
-          //Case 4c: current in H sig.non HT will not come here since it went in previous if or if the previous ifis not true this will be not true
-          else if (current >=plcpHsigHeaderStart)
+          // Case 2c: current in H sig. non HT will not come here since it went in previous if or if the previous ifis not true this will be not true
+          else if (current >= plcpHsigHeaderStart)
              {
                 psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                                 noiseInterferenceW,
@@ -418,47 +477,40 @@
                                                    MfHeaderMode);
 
              }
-         //Case 4d: Current with prev in L SIG
+         // Case 2d: Current with prev in L SIG
          else 
             {
-                //Case 4di: Non HT format (No HT-SIG or Training Symbols)
+              // Case 4di: Non HT format (No HT-SIG or Training Symbols)
               if (preamble == WIFI_PREAMBLE_LONG || preamble == WIFI_PREAMBLE_SHORT) //plcpHtTrainingSymbolsStart==plcpHeaderStart)
                 {
                     psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
-                                                              noiseInterferenceW,
-                                                              headerMode),
-                                                current - previous,
-                                                headerMode);
+                                                                    noiseInterferenceW,
+                                                                    headerMode),
+                                                      current - previous,
+                                                      headerMode);
                 }
-               else
+              else
                 {
-                psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
+                    psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                                noiseInterferenceW,
                                                                MfHeaderMode),
-                                                 current - previous,
-                                                 MfHeaderMode);
+                                                      current - previous,
+                                                      MfHeaderMode);
                 }
             }
         }
-      //Case 5: previous is in the preamble works for all cases
+      // Case 3: previous is in the preamble works for all cases
       else
         {
           if (current >= plcpPayloadStart)
             {
-              //for all
-              psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
-                                                              noiseInterferenceW,
-                                                              payloadMode),
-                                                current - plcpPayloadStart,
-                                                payloadMode); 
-             
-               // Non HT format (No HT-SIG or Training Symbols)
+              // Non HT format (No HT-SIG or Training Symbols)
               if (preamble == WIFI_PREAMBLE_LONG || preamble == WIFI_PREAMBLE_SHORT)
                  psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                                  noiseInterferenceW,
-                                                                  headerMode),
-                                                    plcpPayloadStart - plcpHeaderStart,
-                                                    headerMode);
+                                                                 headerMode),
+                                                   plcpPayloadStart - plcpHeaderStart,
+                                                   headerMode);
               else
               // Greenfield or Mixed format
                 psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
@@ -473,24 +525,27 @@
                                                    plcpHsigHeaderStart-plcpHeaderStart,
                                                    MfHeaderMode);             
             }
-          else if (current >=plcpHtTrainingSymbolsStart )
+          else if (current >= plcpHtTrainingSymbolsStart )
           { 
               // Non HT format will not come here since it will execute prev if
               // Greenfield or Mixed format
-                psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
-                                                                noiseInterferenceW,
-                                                                headerMode),
-                                                  plcpHtTrainingSymbolsStart - plcpHsigHeaderStart,
-                                                  headerMode);
+              psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
+                                                              noiseInterferenceW,
+                                                              headerMode),
+                                                plcpHtTrainingSymbolsStart - plcpHsigHeaderStart,
+                                                headerMode);
+              // Greenfield
               if (preamble == WIFI_PREAMBLE_HT_MF)
-                 psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
-                                                                 noiseInterferenceW,
-                                                                 MfHeaderMode),
-                                                   plcpHsigHeaderStart-plcpHeaderStart,
-                                                   MfHeaderMode);       
+                {
+                    psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
+                                                                    noiseInterferenceW,
+                                                                    MfHeaderMode),
+                                                      plcpHsigHeaderStart-plcpHeaderStart,
+                                                      MfHeaderMode);
+                }
            }
-          //non HT will not come here     
-          else if (current >=plcpHsigHeaderStart)
+          // non HT will not come here
+          else if (current >= plcpHsigHeaderStart)
              { 
                 psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                                 noiseInterferenceW,
@@ -513,17 +568,17 @@
                  {
                  psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                                  noiseInterferenceW,
-                                                                  headerMode),
-                                                    current - plcpHeaderStart,
-                                                    headerMode);
+                                                                 headerMode),
+                                                   current - plcpHeaderStart,
+                                                   headerMode);
                  }
               else
                  {
               psr *= CalculateChunkSuccessRate (CalculateSnr (powerW,
                                                               noiseInterferenceW,
-                                                             MfHeaderMode),
-                                               current - plcpHeaderStart,
-                                               MfHeaderMode);
+                                                              MfHeaderMode),
+                                                current - plcpHeaderStart,
+                                                MfHeaderMode);
                        }
             }
         }
@@ -537,9 +592,8 @@
   return per;
 }
 
-
 struct InterferenceHelper::SnrPer
-InterferenceHelper::CalculateSnrPer (Ptr<InterferenceHelper::Event> event)
+InterferenceHelper::CalculatePlcpPayloadSnrPer (Ptr<InterferenceHelper::Event> event)
 {
   NiChanges ni;
   double noiseInterferenceW = CalculateNoiseInterferenceW (event, &ni);
@@ -550,7 +604,27 @@
   /* calculate the SNIR at the start of the packet and accumulate
    * all SNIR changes in the snir vector.
    */
-  double per = CalculatePer (event, &ni);
+  double per = CalculatePlcpPayloadPer (event, &ni);
+
+  struct SnrPer snrPer;
+  snrPer.snr = snr;
+  snrPer.per = per;
+  return snrPer;
+}
+
+struct InterferenceHelper::SnrPer
+InterferenceHelper::CalculatePlcpHeaderSnrPer (Ptr<InterferenceHelper::Event> event)
+{
+  NiChanges ni;
+  double noiseInterferenceW = CalculateNoiseInterferenceW (event, &ni);
+  double snr = CalculateSnr (event->GetRxPowerW (),
+                             noiseInterferenceW,
+                             WifiPhy::GetPlcpHeaderMode (event->GetPayloadMode (), event->GetPreambleType ()));
+
+  /* calculate the SNIR at the start of the plcp header and accumulate
+   * all SNIR changes in the snir vector.
+   */
+  double per = CalculatePlcpHeaderPer (event, &ni);
 
   struct SnrPer snrPer;
   snrPer.snr = snr;
diff -Naur ns-3.22/src/wifi/model/interference-helper.h ns-3.23/src/wifi/model/interference-helper.h
--- ns-3.22/src/wifi/model/interference-helper.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/interference-helper.h	2015-05-13 11:05:27.000000000 -0700
@@ -51,15 +51,15 @@
      * Create an Event with the given parameters.
      *
      * \param size packet size
-     * \param payloadMode Wi-Fi mode used for the payload
+     * \param txvector TXVECTOR of the packet
      * \param preamble preamble type
      * \param duration duration of the signal
      * \param rxPower the receive power (w)
      * \param txvector TXVECTOR of the packet
      */
-    Event (uint32_t size, WifiMode payloadMode,
+    Event (uint32_t size, WifiTxVector txvector,
            enum WifiPreamble preamble,
-           Time duration, double rxPower, WifiTxVector txvector);
+           Time duration, double rxPower);
     ~Event ();
 
     /**
@@ -93,6 +93,12 @@
      */
     uint32_t GetSize (void) const;
     /**
+     * Return the TXVECTOR of the packet.
+     *
+     * \return the TXVECTOR of the packet
+     */
+    WifiTxVector GetTxVector (void) const;
+    /**
      * Return the Wi-Fi mode used for the payload.
      *
      * \return the Wi-Fi mode used for the payload
@@ -104,20 +110,14 @@
      * \return the preamble type of the packet
      */
     enum WifiPreamble GetPreambleType (void) const;
-    /**
-     * Return the TXVECTOR of the packet.
-     *
-     * \return the TXVECTOR of the packet
-     */
-    WifiTxVector GetTxVector (void) const;
+
 private:
     uint32_t m_size;
-    WifiMode m_payloadMode;
+    WifiTxVector m_txVector;
     enum WifiPreamble m_preamble;
     Time m_startTime;
     Time m_endTime;
     double m_rxPowerW;
-    WifiTxVector m_txVector;
   };
   /**
    * A struct for both SNR and PER
@@ -170,25 +170,32 @@
    * Add the packet-related signal to interference helper.
    *
    * \param size packet size
-   * \param payloadMode Wi-Fi mode for the payload
+   * \param txvector TXVECTOR of the packet
    * \param preamble Wi-Fi preamble for the packet
    * \param duration the duration of the signal
    * \param rxPower receive power (w)
-   * \param txvector TXVECTOR of the packet
    * \return InterferenceHelper::Event
    */
-  Ptr<InterferenceHelper::Event> Add (uint32_t size, WifiMode payloadMode,
+  Ptr<InterferenceHelper::Event> Add (uint32_t size, WifiTxVector txvector,
                                       enum WifiPreamble preamble,
-                                      Time duration, double rxPower, WifiTxVector txvector);
+                                      Time duration, double rxPower);
 
   /**
-   * Calculate the SNIR at the start of the packet and accumulate
+   * Calculate the SNIR at the start of the plcp payload and accumulate
+   * all SNIR changes in the snir vector.
+   *
+   * \param event the event corresponding to the first time the corresponding packet arrives
+   * \return struct of SNR and PER
+   */
+  struct InterferenceHelper::SnrPer CalculatePlcpPayloadSnrPer (Ptr<InterferenceHelper::Event> event);
+  /**
+   * Calculate the SNIR at the start of the plcp header and accumulate
    * all SNIR changes in the snir vector.
    *
-   * \param event the event corresponding to the first time the packet arrives
+   * \param event the event corresponding to the first time the corresponding packet arrives
    * \return struct of SNR and PER
    */
-  struct InterferenceHelper::SnrPer CalculateSnrPer (Ptr<InterferenceHelper::Event> event);
+  struct InterferenceHelper::SnrPer CalculatePlcpHeaderSnrPer (Ptr<InterferenceHelper::Event> event);
   /**
    * Notify that RX has started.
    */
@@ -284,14 +291,23 @@
    */
   double CalculateChunkSuccessRate (double snir, Time duration, WifiMode mode) const;
   /**
-   * Calculate the error rate of the given packet. The packet can be divided into
+   * Calculate the error rate of the given plcp payload. The plcp payload can be divided into
+   * multiple chunks (e.g. due to interference from other transmissions).
+   *
+   * \param event
+   * \param ni
+   * \return the error rate of the packet
+   */
+  double CalculatePlcpPayloadPer (Ptr<const Event> event, NiChanges *ni) const;
+  /**
+   * Calculate the error rate of the plcp header. The plcp header can be divided into
    * multiple chunks (e.g. due to interference from other transmissions).
    *
    * \param event
    * \param ni
    * \return the error rate of the packet
    */
-  double CalculatePer (Ptr<const Event> event, NiChanges *ni) const;
+  double CalculatePlcpHeaderPer (Ptr<const Event> event, NiChanges *ni) const;
 
   double m_noiseFigure; /**< noise figure (linear) */
   Ptr<ErrorRateModel> m_errorRateModel;
diff -Naur ns-3.22/src/wifi/model/mac-low.cc ns-3.23/src/wifi/model/mac-low.cc
--- ns-3.22/src/wifi/model/mac-low.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/mac-low.cc	2015-05-13 11:05:27.000000000 -0700
@@ -61,6 +61,7 @@
 MacLowTransmissionListener::MissedBlockAck (void)
 {
 }
+
 MacLowDcfListener::MacLowDcfListener ()
 {
 }
@@ -68,49 +69,64 @@
 {
 }
 
-MacLowBlockAckEventListener::MacLowBlockAckEventListener ()
+MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener ()
 {
 }
-MacLowBlockAckEventListener::~MacLowBlockAckEventListener ()
+MacLowAggregationCapableTransmissionListener::~MacLowAggregationCapableTransmissionListener ()
 {
 }
 
-void MacLowBlockAckEventListener::SetAmpdu (bool ampdu)
+void MacLowAggregationCapableTransmissionListener::SetAmpdu (bool ampdu)
 {
 }
-void MacLowBlockAckEventListener::CompleteTransfer(Mac48Address address, uint8_t tid)
+void MacLowAggregationCapableTransmissionListener::CompleteTransfer(Mac48Address address, uint8_t tid)
 {
 }
 void
-MacLowBlockAckEventListener::CompleteMpduTx (Ptr<const Packet> packet, WifiMacHeader hdr, Time tstamp)
+MacLowAggregationCapableTransmissionListener::CompleteMpduTx (Ptr<const Packet> packet, WifiMacHeader hdr, Time tstamp)
 {
 }
 uint16_t 
-MacLowBlockAckEventListener::GetNextSequenceNumberfor (WifiMacHeader *hdr)
+MacLowAggregationCapableTransmissionListener::GetNextSequenceNumberfor (WifiMacHeader *hdr)
 {
  return 0;
 }
 uint16_t 
-MacLowBlockAckEventListener::PeekNextSequenceNumberfor (WifiMacHeader *hdr)
+MacLowAggregationCapableTransmissionListener::PeekNextSequenceNumberfor (WifiMacHeader *hdr)
 {
  return 0;
 }
 Ptr<const Packet> 
-MacLowBlockAckEventListener::PeekNextPacketInBaQueue (WifiMacHeader &header, Mac48Address recipient, uint8_t tid, Time *timestamp)
+MacLowAggregationCapableTransmissionListener::PeekNextPacketInBaQueue (WifiMacHeader &header, Mac48Address recipient, uint8_t tid, Time *timestamp)
 {
  return 0;
 }
 void 
-MacLowBlockAckEventListener::RemoveFromBaQueue (uint8_t tid, Mac48Address recipient, uint16_t seqnumber)
+MacLowAggregationCapableTransmissionListener::RemoveFromBaQueue (uint8_t tid, Mac48Address recipient, uint16_t seqnumber)
 {
 }
 uint32_t 
-MacLowBlockAckEventListener::GetNOutstandingPackets (Mac48Address recipient, uint8_t tid)
+MacLowAggregationCapableTransmissionListener::GetNOutstandingPackets (Mac48Address recipient, uint8_t tid)
 {
   return 0;
 }
 uint32_t 
-MacLowBlockAckEventListener::GetNRetryNeededPackets (Mac48Address recipient, uint8_t tid) const
+MacLowAggregationCapableTransmissionListener::GetNRetryNeededPackets (Mac48Address recipient, uint8_t tid) const
+{
+  return 0;
+}
+Ptr<MsduAggregator>
+MacLowAggregationCapableTransmissionListener::GetMsduAggregator (void) const
+{
+  return 0;
+}
+Mac48Address
+MacLowAggregationCapableTransmissionListener::GetSrcAddressForAggregation (const WifiMacHeader &hdr)
+{
+  return 0;
+}
+Mac48Address
+MacLowAggregationCapableTransmissionListener::GetDestAddressForAggregation (const WifiMacHeader &hdr)
 {
   return 0;
 }
@@ -503,7 +519,7 @@
 void
 MacLow::ResetPhy (void)
 {
-  m_phy->SetReceiveOkCallback (MakeNullCallback<void,Ptr<Packet>, double, WifiMode, enum WifiPreamble>  ());
+  m_phy->SetReceiveOkCallback (MakeNullCallback<void,Ptr<Packet>, double, WifiTxVector, enum WifiPreamble>  ());
   m_phy->SetReceiveErrorCallback (MakeNullCallback<void,Ptr<const Packet>, double> ());
   RemovePhyMacLowListener (m_phy);
   m_phy = 0;
@@ -759,7 +775,7 @@
                                                 hdr.GetQosTid(),
                                                 hdr.GetAddr2 (),
                                                 hdr.GetDuration (),
-                                                m_currentMode);
+                                                m_currentTxVector);
         }
       else if (hdr.IsBlockAckReq())
         {
@@ -808,9 +824,9 @@
 }
 
 void
-MacLow::ReceiveOk (Ptr<Packet> packet, double rxSnr, WifiMode txMode, WifiPreamble preamble, bool ampduSubframe)
+MacLow::ReceiveOk (Ptr<Packet> packet, double rxSnr, WifiTxVector txVector, WifiPreamble preamble, bool ampduSubframe)
 {
-  NS_LOG_FUNCTION (this << packet << rxSnr << txMode << preamble);
+  NS_LOG_FUNCTION (this << packet << rxSnr << txVector.GetMode () << preamble);
   /* A packet is received from the PHY.
    * When we have handled this packet,
    * we handle any packet present in the
@@ -821,7 +837,7 @@
 
   bool isPrevNavZero = IsNavZero ();
   NS_LOG_DEBUG ("duration/id=" << hdr.GetDuration ());
-  NotifyNav (packet,hdr, txMode, preamble);
+  NotifyNav (packet, hdr, preamble);
   if (hdr.IsRts ())
     {
       /* see section 9.2.5.7 802.11-1999
@@ -842,12 +858,12 @@
               NS_LOG_DEBUG ("rx RTS from=" << hdr.GetAddr2 () << ", schedule CTS");
               NS_ASSERT (m_sendCtsEvent.IsExpired ());
               m_stationManager->ReportRxOk (hdr.GetAddr2 (), &hdr,
-                                            rxSnr, txMode);
+                                            rxSnr, txVector.GetMode ());
               m_sendCtsEvent = Simulator::Schedule (GetSifs (),
                                                     &MacLow::SendCtsAfterRts, this,
                                                     hdr.GetAddr2 (),
                                                     hdr.GetDuration (),
-                                                    txMode,
+                                                    txVector,
                                                     rxSnr);
             }
           else
@@ -869,19 +885,18 @@
       SnrTag tag;
       packet->RemovePacketTag (tag);
       m_stationManager->ReportRxOk (m_currentHdr.GetAddr1 (), &m_currentHdr,
-                                    rxSnr, txMode);
+                                    rxSnr, txVector.GetMode ());
       m_stationManager->ReportRtsOk (m_currentHdr.GetAddr1 (), &m_currentHdr,
-                                     rxSnr, txMode, tag.Get ());
+                                     rxSnr, txVector.GetMode (), tag.Get ());
 
       m_ctsTimeoutEvent.Cancel ();
       NotifyCtsTimeoutResetNow ();
-      m_listener->GotCts (rxSnr, txMode);
+      m_listener->GotCts (rxSnr, txVector.GetMode ());
       NS_ASSERT (m_sendDataEvent.IsExpired ());
       m_sendDataEvent = Simulator::Schedule (GetSifs (),
                                              &MacLow::SendDataAfterCts, this,
                                              hdr.GetAddr1 (),
-                                             hdr.GetDuration (),
-                                             txMode);
+                                             hdr.GetDuration ());
     }
   else if (hdr.IsAck ()
            && hdr.GetAddr1 () == m_self
@@ -894,10 +909,11 @@
       SnrTag tag;
       packet->RemovePacketTag (tag);
       m_stationManager->ReportRxOk (m_currentHdr.GetAddr1 (), &m_currentHdr,
-                                    rxSnr, txMode);
+                                    rxSnr, txVector.GetMode ());
       m_stationManager->ReportDataOk (m_currentHdr.GetAddr1 (), &m_currentHdr,
-                                      rxSnr, txMode, tag.Get ());
-        
+                                      rxSnr, txVector.GetMode (), tag.Get ());
+
+      FlushAggregateQueue();
       bool gotAck = false;
       if (m_txParams.MustWaitNormalAck ()
           && m_normalAckTimeoutEvent.IsRunning ())
@@ -915,7 +931,7 @@
         }
       if (gotAck)
         {
-          m_listener->GotAck (rxSnr, txMode);
+          m_listener->GotAck (rxSnr, txVector.GetMode ());
         }
       if (m_txParams.HasNextPacket ())
         {
@@ -932,9 +948,10 @@
       packet->RemoveHeader (blockAck);
       m_blockAckTimeoutEvent.Cancel ();
       NotifyAckTimeoutResetNow ();
-      m_listener->GotBlockAck (&blockAck, hdr.GetAddr2 (),txMode);
+      m_listener->GotBlockAck (&blockAck, hdr.GetAddr2 (), txVector.GetMode ());
       m_sentMpdus = 0;
       m_ampdu = false;
+      FlushAggregateQueue();
     }
   else if (hdr.IsBlockAckReq () && hdr.GetAddr1 () == m_self)
     {
@@ -962,7 +979,7 @@
                                                         blockAckReq,
                                                         hdr.GetAddr2 (),
                                                         hdr.GetDuration (),
-                                                        txMode);
+                                                        txVector.GetMode ());
                 }
               else
                 {
@@ -988,7 +1005,7 @@
   else if (hdr.GetAddr1 () == m_self)
     {
       m_stationManager->ReportRxOk (hdr.GetAddr2 (), &hdr,
-                                    rxSnr, txMode);
+                                    rxSnr, txVector.GetMode ());
       if (hdr.IsQosData () && ReceiveMpdu (packet, hdr))
         {
           /* From section 9.10.4 in IEEE 802.11:
@@ -1009,7 +1026,7 @@
                                                     &MacLow::SendAckAfterData, this,
                                                     hdr.GetAddr2 (),
                                                     hdr.GetDuration (),
-                                                    txMode,
+                                                    txVector.GetMode (),
                                                     rxSnr);
               m_receivedAtLeastOneMpdu = false;
             }
@@ -1060,7 +1077,7 @@
                                                     &MacLow::SendAckAfterData, this,
                                                     hdr.GetAddr2 (),
                                                     hdr.GetDuration (),
-                                                    txMode,
+                                                    txVector.GetMode (),
                                                     rxSnr);
             }
         }
@@ -1165,32 +1182,24 @@
 Time
 MacLow::GetAckDuration (Mac48Address to, WifiTxVector dataTxVector) const
 {
-  WifiTxVector ackTxVector = GetAckTxVectorForData (to, dataTxVector.GetMode());
+  WifiTxVector ackTxVector = GetAckTxVectorForData (to, dataTxVector.GetMode ());
   return GetAckDuration (ackTxVector);
 }
 Time
 MacLow::GetAckDuration (WifiTxVector ackTxVector) const
 {
-  WifiPreamble preamble;
-  if (ackTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
-  else
-    preamble=WIFI_PREAMBLE_LONG;
-  return m_phy->CalculateTxDuration (GetAckSize (), ackTxVector, preamble, m_phy->GetFrequency(), 0, 0);
+  NS_ASSERT (ackTxVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HT); // ACK should always use non-HT PPDU (HT PPDU cases not supported yet)
+  return m_phy->CalculateTxDuration (GetAckSize (), ackTxVector, WIFI_PREAMBLE_LONG, m_phy->GetFrequency(), 0, 0);
 }
 Time
 MacLow::GetBlockAckDuration (Mac48Address to, WifiTxVector blockAckReqTxVector, enum BlockAckType type) const
 {
   /*
-   * For immediate BlockAck we should transmit the frame with the same WifiMode
+   * For immediate Basic BlockAck we should transmit the frame with the same WifiMode
    * as the BlockAckReq.
-   *
-   * from section 9.6 in IEEE 802.11e:
-   * The BlockAck control frame shall be sent at the same rate and modulation class as
-   * the BlockAckReq frame if it is sent in response to a BlockAckReq frame.
    */
   WifiPreamble preamble;
-  if (blockAckReqTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
+  if (blockAckReqTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT && type == BASIC_BLOCK_ACK)
     preamble= WIFI_PREAMBLE_HT_MF;
   else
     preamble=WIFI_PREAMBLE_LONG;
@@ -1199,19 +1208,15 @@
 Time
 MacLow::GetCtsDuration (Mac48Address to, WifiTxVector rtsTxVector) const
 {
-  WifiTxVector ctsTxVector = GetCtsTxVectorForRts (to, rtsTxVector.GetMode());
+  WifiTxVector ctsTxVector = GetCtsTxVectorForRts (to, rtsTxVector.GetMode ());
   return GetCtsDuration (ctsTxVector);
 }
 
 Time
 MacLow::GetCtsDuration (WifiTxVector ctsTxVector) const
 {
-  WifiPreamble preamble;
-  if (ctsTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
-  else
-    preamble=WIFI_PREAMBLE_LONG;
-  return m_phy->CalculateTxDuration (GetCtsSize (), ctsTxVector, preamble, m_phy->GetFrequency(), 0, 0);
+  NS_ASSERT (ctsTxVector.GetMode ().GetModulationClass () != WIFI_MOD_CLASS_HT); // CTS should always use non-HT PPDU (HT PPDU cases not supported yet)
+  return m_phy->CalculateTxDuration (GetCtsSize (), ctsTxVector, WIFI_PREAMBLE_LONG, m_phy->GetFrequency(), 0, 0);
 }
 uint32_t
 MacLow::GetCtsSize (void) const
@@ -1296,12 +1301,9 @@
         {
           preamble = WIFI_PREAMBLE_HT_GF;
         }
-      else if (rtsTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT)
-        {
-          preamble = WIFI_PREAMBLE_HT_MF;
-        }
       else
         {
+          //Otherwise, RTS should always use non-HT PPDU (HT PPDU cases not supported yet)
           preamble = WIFI_PREAMBLE_LONG;
         }
       txTime += m_phy->CalculateTxDuration (GetRtsSize (), rtsTxVector, preamble, m_phy->GetFrequency(), 0, 0);
@@ -1309,13 +1311,10 @@
       txTime += Time (GetSifs () * 2);
     }
   WifiTxVector dataTxVector = GetDataTxVector (packet, hdr);
-  //standard says RTS packets can have GF format sec 9.6.0e.1 page 110 bullet b 2
   if ( m_phy->GetGreenfield()&& m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
-    preamble= WIFI_PREAMBLE_HT_GF;
-  else if (dataTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
-  else
-    preamble=WIFI_PREAMBLE_LONG;
+    preamble = WIFI_PREAMBLE_HT_GF;
+  else //Otherwise, RTS should always use non-HT PPDU (HT PPDU cases not supported yet)
+    preamble = WIFI_PREAMBLE_LONG;
   uint32_t dataSize = GetSize (packet, hdr);
   txTime += m_phy->CalculateTxDuration (dataSize, dataTxVector, preamble, m_phy->GetFrequency(), 0, 0);
   if (params.MustWaitAck ())
@@ -1336,7 +1335,7 @@
     {
       WifiTxVector dataTxVector = GetDataTxVector (packet, hdr);
       WifiPreamble preamble;
-        //standard says RTS packets can have GF format sec 9.6.0e.1 page 110 bullet b 2
+      //standard says RTS packets can have GF format sec 9.6.0e.1 page 110 bullet b 2
       if ( m_phy->GetGreenfield()&& m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
          preamble= WIFI_PREAMBLE_HT_GF;
       else if (dataTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
@@ -1350,7 +1349,7 @@
 }
 
 void
-MacLow::NotifyNav (Ptr<const Packet> packet,const WifiMacHeader &hdr, WifiMode txMode, WifiPreamble preamble)
+MacLow::NotifyNav (Ptr<const Packet> packet,const WifiMacHeader &hdr, WifiPreamble preamble)
 {
   NS_ASSERT (m_lastNavStart <= Simulator::Now ());
   Time duration = hdr.GetDuration ();
@@ -1468,7 +1467,7 @@
   NS_LOG_DEBUG ("send " << hdr->GetTypeString () <<
                 ", to=" << hdr->GetAddr1 () <<
                 ", size=" << packet->GetSize () <<
-                ", mode=" << txVector.GetMode() <<
+                ", mode=" << txVector.GetMode  () <<
                 ", duration=" << hdr->GetDuration () <<
                 ", seq=0x" << std::hex << m_currentHdr.GetSequenceControl () << std::dec);
   if (!m_ampdu || hdr->IsRts ())
@@ -1560,6 +1559,7 @@
   m_listener = 0;
   m_sentMpdus = 0;
   m_ampdu = false;
+  FlushAggregateQueue();
   listener->MissedAck ();
 }
 void
@@ -1590,6 +1590,7 @@
   m_listener = 0;
   m_sentMpdus = 0;
   m_ampdu = false;
+  FlushAggregateQueue();
   listener->MissedBlockAck ();
 }
 void
@@ -1629,12 +1630,10 @@
 
   WifiPreamble preamble;
   //standard says RTS packets can have GF format sec 9.6.0e.1 page 110 bullet b 2
-  if ( m_phy->GetGreenfield()&& m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
+  if (m_phy->GetGreenfield () && m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
     preamble= WIFI_PREAMBLE_HT_GF;
-  else if (rtsTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
-  else
-    preamble=WIFI_PREAMBLE_LONG;
+  else //Otherwise, RTS should always use non-HT PPDU (HT PPDU cases not supported yet)
+    preamble = WIFI_PREAMBLE_LONG;
 
   if (m_txParams.HasDurationId ())
     {
@@ -1651,12 +1650,12 @@
       duration += GetSifs ();
       if (m_txParams.MustWaitBasicBlockAck ())
         {
-          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2(), dataTxVector.GetMode());
+          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2(), dataTxVector.GetMode  ());
           duration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, BASIC_BLOCK_ACK);
         }
       else if (m_txParams.MustWaitCompressedBlockAck ())
         {
-          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2(), dataTxVector.GetMode());
+          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2(), dataTxVector.GetMode  ());
           duration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, COMPRESSED_BLOCK_ACK);
         }
       else if (m_txParams.MustWaitAck ())
@@ -1698,11 +1697,11 @@
  
   //Since it is data then it can have format = GF
   if (m_phy->GetGreenfield() && m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
-    preamble= WIFI_PREAMBLE_HT_GF;
-  else if (dataTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
+    preamble = WIFI_PREAMBLE_HT_GF;
+  else if (dataTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT)
+    preamble = WIFI_PREAMBLE_HT_MF;
   else
-    preamble=WIFI_PREAMBLE_LONG;
+    preamble = WIFI_PREAMBLE_LONG;
  
   Time txDuration = m_phy->CalculateTxDuration (GetSize (m_currentPacket, &m_currentHdr), dataTxVector, preamble, m_phy->GetFrequency(), 0, 0);
   if (m_txParams.MustWaitNormalAck ())
@@ -1773,11 +1772,11 @@
           
   if (m_phy->GetGreenfield() && m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
      //In the future has to make sure that receiver has greenfield enabled
-     preamble= WIFI_PREAMBLE_HT_GF;
-  else if (dataTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
+     preamble = WIFI_PREAMBLE_HT_GF;
+  else if (dataTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT)
+    preamble = WIFI_PREAMBLE_HT_MF;
   else
-     preamble=WIFI_PREAMBLE_LONG;
+     preamble = WIFI_PREAMBLE_LONG;
   
   StartDataTxTimers (dataTxVector);
 
@@ -1791,13 +1790,13 @@
       if (m_txParams.MustWaitBasicBlockAck ())
         {
           duration += GetSifs ();
-          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode());
+          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode ());
           duration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, BASIC_BLOCK_ACK);
         }
       else if (m_txParams.MustWaitCompressedBlockAck ())
         {
           duration += GetSifs ();
-          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode());
+          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode ());
           duration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, COMPRESSED_BLOCK_ACK);
         }
       else if (m_txParams.MustWaitAck ())
@@ -1826,7 +1825,7 @@
       m_currentPacket->AddTrailer (fcs);
     }
 
-  ForwardDown (m_currentPacket, &m_currentHdr, dataTxVector,preamble);
+  ForwardDown (m_currentPacket, &m_currentHdr, dataTxVector, preamble);
   m_currentPacket = 0;
 }
 
@@ -1856,10 +1855,10 @@
   WifiTxVector ctsTxVector = GetCtsToSelfTxVector (m_currentPacket, &m_currentHdr);
 
   WifiPreamble preamble;
-  if (ctsTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
+  if (ctsTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT)
+    preamble = WIFI_PREAMBLE_HT_MF;
   else
-    preamble=WIFI_PREAMBLE_LONG;
+    preamble = WIFI_PREAMBLE_LONG;
   
   Time duration = Seconds (0);
 
@@ -1877,13 +1876,13 @@
         {
           
           duration += GetSifs ();
-          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode());
+          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode ());
           duration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, BASIC_BLOCK_ACK);
         }
       else if (m_txParams.MustWaitCompressedBlockAck ())
         {
           duration += GetSifs ();
-          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode());
+          WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode ());
           duration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, COMPRESSED_BLOCK_ACK);
         }
       else if (m_txParams.MustWaitAck ())
@@ -1899,7 +1898,7 @@
           if (m_txParams.MustWaitCompressedBlockAck ())
             {
               duration += GetSifs ();
-              WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode());
+              WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode ());
               duration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, COMPRESSED_BLOCK_ACK);
             }
           else if (m_txParams.MustWaitAck ())
@@ -1926,17 +1925,16 @@
   m_sendDataEvent = Simulator::Schedule (txDuration,
                                          &MacLow::SendDataAfterCts, this,
                                          cts.GetAddr1 (),
-                                         duration,
-                                         ctsTxVector.GetMode());
+                                         duration);
 }
 void
-MacLow::SendCtsAfterRts (Mac48Address source, Time duration, WifiMode rtsTxMode, double rtsSnr)
+MacLow::SendCtsAfterRts (Mac48Address source, Time duration, WifiTxVector rtsTxVector, double rtsSnr)
 {
-  NS_LOG_FUNCTION (this << source << duration << rtsTxMode << rtsSnr);
+  NS_LOG_FUNCTION (this << source << duration << rtsTxVector.GetMode () << rtsSnr);
   /* send a CTS when you receive a RTS
    * right after SIFS.
    */
- WifiTxVector ctsTxVector = GetCtsTxVector (source, rtsTxMode);
+  WifiTxVector ctsTxVector = GetCtsTxVector (source, rtsTxVector.GetMode ());
   WifiMacHeader cts;
   cts.SetType (WIFI_MAC_CTL_CTS);
   cts.SetDsNotFrom ();
@@ -1944,7 +1942,7 @@
   cts.SetNoMoreFragments ();
   cts.SetNoRetry ();
   cts.SetAddr1 (source);
-  duration -= GetCtsDuration (source, ctsTxVector);
+  duration -= GetCtsDuration (source, rtsTxVector);
   duration -= GetSifs ();
   NS_ASSERT (duration >= MicroSeconds (0));
   cts.SetDuration (duration);
@@ -1958,16 +1956,12 @@
   tag.Set (rtsSnr);
   packet->AddPacketTag (tag);
 
-  WifiPreamble preamble;
-  if (ctsTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
-  else
-    preamble=WIFI_PREAMBLE_LONG;
-  ForwardDown (packet, &cts, ctsTxVector,preamble);
+  //CTS should always use non-HT PPDU (HT PPDU cases not supported yet)
+  ForwardDown (packet, &cts, ctsTxVector, WIFI_PREAMBLE_LONG);
 }
 
 void
-MacLow::SendDataAfterCts (Mac48Address source, Time duration, WifiMode txMode)
+MacLow::SendDataAfterCts (Mac48Address source, Time duration)
 {
   NS_LOG_FUNCTION (this);
   /* send the third step in a
@@ -1976,27 +1970,40 @@
   NS_ASSERT (m_currentPacket != 0);
   WifiTxVector dataTxVector = GetDataTxVector (m_currentPacket, &m_currentHdr);
   
+  if (m_aggregateQueue->GetSize () != 0)
+  {
+    for (std::vector<Item>::size_type i = 0; i != m_txPackets.size(); i++)
+    {
+      uint8_t tid = GetTid (m_txPackets.at(i).packet, m_txPackets.at(i).hdr);
+      AcIndex ac = QosUtilsMapTidToAc (tid);
+      std::map<AcIndex, MacLowAggregationCapableTransmissionListener*>::const_iterator listenerIt= m_edcaListeners.find(ac);
+      
+      listenerIt->second->CompleteMpduTx (m_txPackets.at(i).packet, m_txPackets.at(i).hdr, m_txPackets.at(i).timestamp);
+    }
+    m_txPackets.clear ();
+  }
+  
   WifiPreamble preamble;       
-  if (m_phy->GetGreenfield() && m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
+  if (m_phy->GetGreenfield () && m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
      //In the future has to make sure that receiver has greenfield enabled
-     preamble= WIFI_PREAMBLE_HT_GF;
-  else if (dataTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
+     preamble = WIFI_PREAMBLE_HT_GF;
+  else if (dataTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT)
+    preamble = WIFI_PREAMBLE_HT_MF;
   else
-     preamble=WIFI_PREAMBLE_LONG;
+     preamble = WIFI_PREAMBLE_LONG;
   
   StartDataTxTimers (dataTxVector);
   Time newDuration = Seconds (0);
   if (m_txParams.MustWaitBasicBlockAck ())
     {
       newDuration += GetSifs ();
-      WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode());
+      WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode ());
       newDuration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, BASIC_BLOCK_ACK);
     }
   else if (m_txParams.MustWaitCompressedBlockAck ())
     {
       newDuration += GetSifs ();
-      WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode());
+      WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode ());
       newDuration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, COMPRESSED_BLOCK_ACK);
     }
   else if (m_txParams.MustWaitAck ())
@@ -2011,7 +2018,7 @@
       if (m_txParams.MustWaitCompressedBlockAck ())
         {
            newDuration += GetSifs ();
-           WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode());
+           WifiTxVector blockAckReqTxVector = GetBlockAckTxVector (m_currentHdr.GetAddr2 (), dataTxVector.GetMode ());
            newDuration += GetBlockAckDuration (m_currentHdr.GetAddr1 (), blockAckReqTxVector, COMPRESSED_BLOCK_ACK);
         }
       else if (m_txParams.MustWaitAck ())
@@ -2093,13 +2100,8 @@
   tag.Set (dataSnr);
   packet->AddPacketTag (tag);
 
-   //since ACK is a control response it can't have format GF
-  WifiPreamble preamble;
-  if (ackTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
-  else
-    preamble=WIFI_PREAMBLE_LONG;
-  ForwardDown (packet, &ack, ackTxVector, preamble);
+  //ACK should always use non-HT PPDU (HT PPDU cases not supported yet)
+  ForwardDown (packet, &ack, ackTxVector, WIFI_PREAMBLE_LONG);
 }
 
 bool
@@ -2215,7 +2217,7 @@
       AcIndex ac = QosUtilsMapTidToAc (agreement.GetTid ());
 
       it->second.first.m_inactivityEvent = Simulator::Schedule (timeout,
-                                                                &MacLowBlockAckEventListener::BlockAckInactivityTimeout,
+                                                                &MacLowAggregationCapableTransmissionListener::BlockAckInactivityTimeout,
                                                                 m_edcaListeners[ac],
                                                                 originator, tid);
     }
@@ -2389,15 +2391,15 @@
   WifiMacTrailer fcs;
   packet->AddTrailer (fcs);
   WifiPreamble preamble;
-  if (blockAckReqTxVector.GetMode().GetModulationClass () == WIFI_MOD_CLASS_HT)
-    preamble= WIFI_PREAMBLE_HT_MF;
+  if (blockAckReqTxVector.GetMode ().GetModulationClass () == WIFI_MOD_CLASS_HT)
+    preamble = WIFI_PREAMBLE_HT_MF;
   else
-    preamble=WIFI_PREAMBLE_LONG;
+    preamble = WIFI_PREAMBLE_LONG;
   ForwardDown (packet, &hdr, blockAckReqTxVector, preamble);
   m_currentPacket = 0;
 }
 void 
-MacLow::SendBlockAckAfterAmpdu (uint8_t tid, Mac48Address originator, Time duration, WifiMode blockAckReqTxMode)
+MacLow::SendBlockAckAfterAmpdu (uint8_t tid, Mac48Address originator, Time duration, WifiTxVector blockAckReqTxVector)
 {
   NS_LOG_FUNCTION (this);
   CtrlBAckResponseHeader blockAck;
@@ -2415,7 +2417,7 @@
   NS_LOG_DEBUG ("Got Implicit block Ack Req with seq " << seqNumber);
   (*i).second.FillBlockAckBitmap (&blockAck);  
 
-  SendBlockAckResponse (&blockAck, originator, immediate, duration, blockAckReqTxMode);
+  SendBlockAckResponse (&blockAck, originator, immediate, duration, blockAckReqTxVector.GetMode  ());
 }
 
 void
@@ -2494,7 +2496,7 @@
       //NS_ASSERT (it != m_edcaListeners.end ());
 
       agreement.m_inactivityEvent = Simulator::Schedule (timeout,
-                                                         &MacLowBlockAckEventListener::BlockAckInactivityTimeout,
+                                                         &MacLowAggregationCapableTransmissionListener::BlockAckInactivityTimeout,
                                                          m_edcaListeners[ac],
                                                          agreement.GetPeer (),
                                                          agreement.GetTid ());
@@ -2502,7 +2504,7 @@
 }
 
 void
-MacLow::RegisterBlockAckListenerForAc (enum AcIndex ac, MacLowBlockAckEventListener *listener)
+MacLow::RegisterBlockAckListenerForAc (enum AcIndex ac, MacLowAggregationCapableTransmissionListener *listener)
 {
   m_edcaListeners.insert (std::make_pair (ac, listener));
 }
@@ -2514,9 +2516,9 @@
 }
 
 void
-MacLow::DeaggregateAmpduAndReceive (Ptr<Packet> aggregatedPacket, double rxSnr, WifiMode txMode, WifiPreamble preamble)
+MacLow::DeaggregateAmpduAndReceive (Ptr<Packet> aggregatedPacket, double rxSnr, WifiTxVector txVector, WifiPreamble preamble)
 {
-  m_currentMode = txMode;
+  m_currentTxVector = txVector;
   AmpduTag ampdu;
   bool normalAck = false;
   bool ampduSubframe = false;
@@ -2529,16 +2531,16 @@
       WifiMacHeader firsthdr;
       (*n).first->PeekHeader(firsthdr);
       NS_LOG_DEBUG ("duration/id=" << firsthdr.GetDuration ());
-      NotifyNav ((*n).first,firsthdr, txMode, preamble);
+      NotifyNav ((*n).first, firsthdr, preamble);
       if (firsthdr.GetAddr1 () == m_self)
         {
           m_receivedAtLeastOneMpdu = true;
           if (firsthdr.IsAck () || firsthdr.IsBlockAck () || firsthdr.IsBlockAckReq ())
-              ReceiveOk ((*n).first, rxSnr, txMode, preamble, ampduSubframe);
+              ReceiveOk ((*n).first, rxSnr, txVector, preamble, ampduSubframe);
           else if (firsthdr.IsData () || firsthdr.IsQosData ())
             {
               NS_LOG_DEBUG ("Deaagregate packet with sequence=" << firsthdr.GetSequenceNumber ());
-              ReceiveOk ((*n).first, rxSnr, txMode, preamble, ampduSubframe);
+              ReceiveOk ((*n).first, rxSnr, txVector, preamble, ampduSubframe);
               if (firsthdr.IsQosAck ())
                 {
                   NS_LOG_DEBUG ("Normal Ack");
@@ -2569,7 +2571,7 @@
                                                     firsthdr.GetQosTid(),
                                                     firsthdr.GetAddr2 (),
                                                     firsthdr.GetDuration (),
-                                                    txMode);
+                                                    txVector);
             } 
           else
             { 
@@ -2580,25 +2582,25 @@
     }
   else
     {     
-          ReceiveOk (aggregatedPacket,rxSnr, txMode, preamble, ampduSubframe);
+          ReceiveOk (aggregatedPacket,rxSnr, txVector, preamble, ampduSubframe);
     }
 }
 
 bool 
-MacLow::StopAggregation(Ptr<const Packet> peekedPacket, WifiMacHeader peekedHdr, Ptr<Packet> aggregatedPacket, uint16_t size) const
+MacLow::StopMpduAggregation(Ptr<const Packet> peekedPacket, WifiMacHeader peekedHdr, Ptr<Packet> aggregatedPacket, uint16_t size) const
 {
     WifiPreamble preamble;
     WifiTxVector dataTxVector = GetDataTxVector (m_currentPacket, &m_currentHdr);
     if (m_phy->GetGreenfield () && m_stationManager->GetGreenfieldSupported (m_currentHdr.GetAddr1 ()))
         preamble = WIFI_PREAMBLE_HT_GF;
-    else
-        preamble = WIFI_PREAMBLE_HT_MF;
+    else //Block ACK following implicit BAR always use non-HT PPDU
+        preamble = WIFI_PREAMBLE_LONG;
     
     if (peekedPacket == 0)
         return true;
     
     //An HT STA shall not transmit a PPDU that has a duration that is greater than aPPDUMaxTime (10 milliseconds)
-    if(m_phy->CalculateTxDuration (aggregatedPacket->GetSize () + peekedPacket->GetSize () + peekedHdr.GetSize () +WIFI_MAC_FCS_LENGTH,dataTxVector, preamble, m_phy->GetFrequency(), 0, 0) > MilliSeconds(10))
+    if(m_phy->CalculateTxDuration (aggregatedPacket->GetSize () + peekedPacket->GetSize () + peekedHdr.GetSize () + WIFI_MAC_FCS_LENGTH, dataTxVector, preamble, m_phy->GetFrequency(), 0, 0) > MilliSeconds(10))
         return true;
     
     if (!m_mpduAggregator->CanBeAggregated (peekedPacket->GetSize () + peekedHdr.GetSize () + WIFI_MAC_FCS_LENGTH, aggregatedPacket, size))
@@ -2612,7 +2614,7 @@
 {
   NS_ASSERT (m_aggregateQueue->GetSize () == 0);
   bool isAmpdu = false;
-  Ptr<Packet> newPacket;
+  Ptr<Packet> newPacket, tempPacket;
   WifiMacHeader peekedHdr;
   newPacket = packet->Copy();
   //missing hdr.IsAck() since we have no means of knowing the Tid of the Ack yet
@@ -2623,7 +2625,7 @@
       Ptr<WifiMacQueue> queue;
       AcIndex ac = QosUtilsMapTidToAc (tid);
       //since a blockack agreement always preceeds mpdu aggregation there should always exist blockAck listener
-      std::map<AcIndex, MacLowBlockAckEventListener*>::const_iterator listenerIt= m_edcaListeners.find(ac);
+      std::map<AcIndex, MacLowAggregationCapableTransmissionListener*>::const_iterator listenerIt= m_edcaListeners.find(ac);
       NS_ASSERT (listenerIt != m_edcaListeners.end ());
       queue = listenerIt->second->GetQueue();
       
@@ -2660,7 +2662,7 @@
 
                   if (aggregated)
                     {
-                      NS_LOG_DEBUG ("Adding packet with Sequence number " << peekedHdr.GetSequenceNumber()<<" to A-MPDU");
+                      NS_LOG_DEBUG ("Adding packet with Sequence number " << peekedHdr.GetSequenceNumber()<<" to A-MPDU, packet size = " << newPacket->GetSize ()<< ", A-MPDU size = " << currentAggregatedPacket->GetSize ());
                       i++;
                       m_sentMpdus++;
                       m_aggregateQueue->Enqueue (aggPacket, peekedHdr);
@@ -2678,12 +2680,20 @@
               bool retry = false;
               //looks for other packets to the same destination with the same Tid need to extend that to include MSDUs
               Ptr<const Packet> peekedPacket = listenerIt->second->PeekNextPacketInBaQueue (peekedHdr, peekedHdr.GetAddr1 (), tid, &tstamp);
-              if (peekedPacket == 0) 
+              if (peekedPacket == 0)
                 {
                   peekedPacket = queue->PeekByTidAndAddress (&peekedHdr, tid,
                                                              WifiMacHeader::ADDR1,
                                                              hdr.GetAddr1 (), &tstamp);
                   currentSequenceNumber = listenerIt->second->PeekNextSequenceNumberfor (&peekedHdr);
+                    
+                  /* here is performed MSDU aggregation (two-level aggregation) */
+                  if (peekedPacket != 0 && listenerIt->second->GetMsduAggregator () != 0)
+                    {
+                       tempPacket = PerformMsduAggregation(peekedPacket, &peekedHdr, &tstamp, currentAggregatedPacket, blockAckSize);
+                       if (tempPacket != 0) //MSDU aggregation
+                         peekedPacket = tempPacket->Copy();
+                    }
                 }
               else
                 {
@@ -2691,7 +2701,7 @@
                   currentSequenceNumber = peekedHdr.GetSequenceNumber(); 
                 }
 
-               while (IsInWindow (currentSequenceNumber, startingSequenceNumber, 64) && !StopAggregation (peekedPacket, peekedHdr, currentAggregatedPacket, blockAckSize))
+               while (IsInWindow (currentSequenceNumber, startingSequenceNumber, 64) && !StopMpduAggregation (peekedPacket, peekedHdr, currentAggregatedPacket, blockAckSize))
                 {
                   //for now always send AMPDU with normal ACK
                   if (retry == false)
@@ -2719,13 +2729,27 @@
                       m_aggregateQueue->Enqueue (aggPacket, peekedHdr);
                       if (i == 1 && hdr.IsQosData ())
                       {
-                          listenerIt->second->CompleteMpduTx (packet, hdr, tstamp);
+                        if (!m_txParams.MustSendRts ())
+                        {
+                           listenerIt->second->CompleteMpduTx (packet, hdr, tstamp);
+                        }
+                        else
+                        {
+                          InsertInTxQueue (packet, hdr, tstamp);
+                        }
                       }
-                      NS_LOG_DEBUG ("Adding packet with Sequence number " << peekedHdr.GetSequenceNumber()<<" to A-MPDU");
+                      NS_LOG_DEBUG ("Adding packet with Sequence number " << peekedHdr.GetSequenceNumber()<<" to A-MPDU, packet size = " << newPacket->GetSize ()<< ", A-MPDU size = " << currentAggregatedPacket->GetSize ());
                       i++;
                       isAmpdu = true;
                       m_sentMpdus++;
-                      listenerIt->second->CompleteMpduTx (peekedPacket, peekedHdr, tstamp);
+                      if (!m_txParams.MustSendRts ())
+                      {
+                        listenerIt->second->CompleteMpduTx (peekedPacket, peekedHdr, tstamp);
+                      }
+                      else
+                      {
+                        InsertInTxQueue (peekedPacket, peekedHdr, tstamp);
+                      }
                       if (retry)
                           listenerIt->second->RemoveFromBaQueue(tid, hdr.GetAddr1 (), peekedHdr.GetSequenceNumber ());
                       else
@@ -2747,6 +2771,13 @@
                             {
                               //find what will the sequence number be so that we don't send more than 64 packets apart
                               currentSequenceNumber = listenerIt->second->PeekNextSequenceNumberfor (&peekedHdr);
+                              
+                              if (listenerIt->second->GetMsduAggregator () != 0)
+                              {
+                                tempPacket = PerformMsduAggregation(peekedPacket, &peekedHdr, &tstamp, currentAggregatedPacket, blockAckSize);
+                                if (tempPacket != 0) //MSDU aggregation
+                                  peekedPacket = tempPacket->Copy();
+                              }
                             }   
                         }
                       else
@@ -2760,6 +2791,13 @@
                         {
                           //find what will the sequence number be so that we don't send more than 64 packets apart
                           currentSequenceNumber = listenerIt->second->PeekNextSequenceNumberfor (&peekedHdr);
+                          
+                          if (listenerIt->second->GetMsduAggregator () != 0 && IsInWindow (currentSequenceNumber, startingSequenceNumber, 64))
+                          {
+                            tempPacket = PerformMsduAggregation(peekedPacket, &peekedHdr, &tstamp, currentAggregatedPacket, blockAckSize);
+                            if (tempPacket != 0) //MSDU aggregation
+                              peekedPacket = tempPacket->Copy();
+                          }
                         }   
                     }
                 }
@@ -2811,6 +2849,73 @@
 {
   NS_LOG_DEBUG("Flush aggregate queue");
   m_aggregateQueue->Flush ();
+  m_txPackets.clear ();
+}
+
+void
+MacLow::InsertInTxQueue (Ptr<const Packet> packet, const WifiMacHeader &hdr, Time tStamp)
+{
+  Item item;
+  
+  item.packet = packet;
+  item.hdr = hdr;
+  item.timestamp = tStamp;
+
+  m_txPackets.push_back (item);
+}
+
+Ptr<Packet>
+MacLow::PerformMsduAggregation(Ptr<const Packet> packet, WifiMacHeader *hdr, Time *tstamp, Ptr<Packet> currentAmpduPacket, uint16_t blockAckSize)
+{
+  bool msduAggregation = false;
+  bool isAmsdu = false;
+  Ptr<Packet> currentAmsduPacket = Create<Packet> ();
+  Ptr<Packet> tempPacket = Create<Packet> ();
+
+  Ptr<WifiMacQueue> queue;
+  AcIndex ac = QosUtilsMapTidToAc (GetTid (packet, *hdr));
+  std::map<AcIndex, MacLowAggregationCapableTransmissionListener*>::const_iterator listenerIt= m_edcaListeners.find(ac);
+  NS_ASSERT (listenerIt != m_edcaListeners.end ());
+  queue = listenerIt->second->GetQueue();
+    
+  listenerIt->second->GetMsduAggregator ()->Aggregate (packet, currentAmsduPacket,
+                                               listenerIt->second->GetSrcAddressForAggregation (*hdr),
+                                               listenerIt->second->GetDestAddressForAggregation (*hdr));
+
+  Ptr<const Packet> peekedPacket = queue->PeekByTidAndAddress (hdr, hdr->GetQosTid (),
+                                                               WifiMacHeader::ADDR1, hdr->GetAddr1 (), tstamp);
+  while (peekedPacket != 0)
+  {
+    tempPacket = currentAmsduPacket;
+   
+    msduAggregation = listenerIt->second->GetMsduAggregator ()->Aggregate (peekedPacket, tempPacket,
+                                                        listenerIt->second->GetSrcAddressForAggregation (*hdr),
+                                                        listenerIt->second->GetDestAddressForAggregation (*hdr));
+      
+    if (msduAggregation && !StopMpduAggregation (tempPacket, *hdr, currentAmpduPacket, blockAckSize))
+    {
+      isAmsdu = true;
+      currentAmsduPacket = tempPacket;
+      queue->Remove (peekedPacket);
+    }
+    else
+    {
+      break;
+    }
+    peekedPacket = queue->PeekByTidAndAddress (hdr, hdr->GetQosTid (), WifiMacHeader::ADDR1, hdr->GetAddr1 (), tstamp);
+  }
+  
+  if (isAmsdu)
+  {
+    NS_LOG_DEBUG ("A-MSDU with size = " << currentAmsduPacket->GetSize ());
+    hdr->SetQosAmsdu ();
+    hdr->SetAddr3 (GetBssid ());
+    return currentAmsduPacket;
+  }
+  else
+  {
+    return 0;
+  }
 }
 
 } // namespace ns3
diff -Naur ns-3.22/src/wifi/model/mac-low.h ns-3.23/src/wifi/model/mac-low.h
--- ns-3.22/src/wifi/model/mac-low.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/mac-low.h	2015-05-13 11:05:27.000000000 -0700
@@ -43,6 +43,9 @@
 #include "block-ack-cache.h"
 #include "wifi-tx-vector.h"
 #include "mpdu-aggregator.h"
+#include "msdu-aggregator.h"
+
+class TwoLevelAggregationTest;
 
 namespace ns3 {
 
@@ -133,7 +136,6 @@
    * 
    */
   virtual void EndTxNoAck (void) = 0;
-
 };
 
 
@@ -188,11 +190,11 @@
  * \ingroup wifi
  * \brief listen for block ack events.
  */
-class MacLowBlockAckEventListener
+class MacLowAggregationCapableTransmissionListener
 {
 public:
-  MacLowBlockAckEventListener ();
-  virtual ~MacLowBlockAckEventListener ();
+  MacLowAggregationCapableTransmissionListener ();
+  virtual ~MacLowAggregationCapableTransmissionListener ();
   /**
    * Typically is called in order to notify EdcaTxopN that a block ack inactivity
    * timeout occurs for the block ack agreement identified by the pair <i>originator</i>, <i>tid</i>.
@@ -272,6 +274,15 @@
    * Returns number of packets for a specific agreement that need retransmission.
    */
   virtual uint32_t GetNRetryNeededPackets (Mac48Address recipient, uint8_t tid) const;
+  /**
+   */
+  virtual Ptr<MsduAggregator> GetMsduAggregator (void) const;
+  /**
+   */
+  virtual Mac48Address GetSrcAddressForAggregation (const WifiMacHeader &hdr);
+  /**
+   */
+  virtual Mac48Address GetDestAddressForAggregation (const WifiMacHeader &hdr);
 };
 
 /**
@@ -475,6 +486,8 @@
 class MacLow : public Object
 {
 public:
+  // Allow test cases to access private members
+  friend class ::TwoLevelAggregationTest;
   /**
    * typedef for a callback for MacLowRx
    */
@@ -698,14 +711,14 @@
   /**
    * \param packet packet received
    * \param rxSnr snr of packet received
-   * \param txMode transmission mode of packet received
+   * \param txVector TXVECTOR of packet received
    * \param preamble type of preamble used for the packet received
    * \param ampduSubframe true if this MPDU is part of an A-MPDU
    *
    * This method is typically invoked by the lower PHY layer to notify
    * the MAC layer that a packet was successfully received.
    */
-  void ReceiveOk (Ptr<Packet> packet, double rxSnr, WifiMode txMode, WifiPreamble preamble, bool ampduSubframe);
+  void ReceiveOk (Ptr<Packet> packet, double rxSnr, WifiTxVector txVector, WifiPreamble preamble, bool ampduSubframe);
   /**
    * \param packet packet received.
    * \param rxSnr snr of packet received.
@@ -762,7 +775,7 @@
    * The lifetime of the registered listener is typically equal to the lifetime of the queue
    * associated to this AC.
    */
-  void RegisterBlockAckListenerForAc (enum AcIndex ac, MacLowBlockAckEventListener *listener);
+  void RegisterBlockAckListenerForAc (enum AcIndex ac, MacLowAggregationCapableTransmissionListener *listener);
   /**
    * \param packet the packet to be aggregated. If the aggregation is succesfull, it corresponds either to the first data packet that will be aggregated or to the BAR that will be piggybacked at the end of the A-MPDU.
    * \param hdr the WifiMacHeader for the packet.
@@ -775,13 +788,13 @@
   /**
    * \param aggregatedPacket which is the current A-MPDU
    * \param rxSnr snr of packet received
-   * \param txMode transmission mode of packet received
-   * \param preamble type of preamble used for the packet received        
+   * \param txVector TXVECTOR of packet received
+   * \param preamble type of preamble used for the packet received
    *
    * This function de-aggregates an A-MPDU and decide if each MPDU is received correctly or not
    * 
    */
-  void DeaggregateAmpduAndReceive (Ptr<Packet> aggregatedPacket, double rxSnr, WifiMode txMode, WifiPreamble preamble);
+  void DeaggregateAmpduAndReceive (Ptr<Packet> aggregatedPacket, double rxSnr, WifiTxVector txVector, WifiPreamble preamble);
   /**
    * \param peekedPacket the packet to be aggregated
    * \param peekedHdr the WifiMacHeader for the packet.
@@ -792,7 +805,7 @@
    * This function decides if a given packet can be added to an A-MPDU or not
    * 
    */
-  bool StopAggregation (Ptr<const Packet> peekedPacket, WifiMacHeader peekedHdr, Ptr<Packet> aggregatedPacket, uint16_t size) const;
+  bool StopMpduAggregation (Ptr<const Packet> peekedPacket, WifiMacHeader peekedHdr, Ptr<Packet> aggregatedPacket, uint16_t size) const;
   /**
    *
    * This function is called to flush the aggregate queue, which is used for A-MPDU
@@ -998,7 +1011,7 @@
   Time CalculateOverallTxTime (Ptr<const Packet> packet,
                                const WifiMacHeader* hdr,
                                const MacLowTransmissionParameters &params) const;
-  void NotifyNav (Ptr<const Packet> packet,const WifiMacHeader &hdr, WifiMode txMode, WifiPreamble preamble);
+  void NotifyNav (Ptr<const Packet> packet,const WifiMacHeader &hdr, WifiPreamble preamble);
   /**
    * Reset NAV with the given duration.
    *
@@ -1086,10 +1099,10 @@
    *
    * \param source
    * \param duration
-   * \param txMode
+   * \param rtsTxVector
    * \param rtsSnr
    */
-  void SendCtsAfterRts (Mac48Address source, Time duration, WifiMode txMode, double rtsSnr);
+  void SendCtsAfterRts (Mac48Address source, Time duration, WifiTxVector rtsTxVector, double rtsSnr);
   /**
    * Send ACK after receiving DATA.
    *
@@ -1104,9 +1117,8 @@
    *
    * \param source
    * \param duration
-   * \param txMode
    */
-  void SendDataAfterCts (Mac48Address source, Time duration, WifiMode txMode);
+  void SendDataAfterCts (Mac48Address source, Time duration);
   /**
    * Event handler that is usually scheduled to fired at the appropriate time
    * after completing transmissions.
@@ -1200,7 +1212,7 @@
    * block ack agreement and creates block ack bitmap on a received packets basis.
    */
   void SendBlockAckAfterAmpdu (uint8_t tid, Mac48Address originator,
-                                          Time duration, WifiMode blockAckReqTxMode);
+                                          Time duration, WifiTxVector blockAckReqTxVector);
   /**
    * This method creates block ack frame with header equals to <i>blockAck</i> and start its transmission.
    *
@@ -1242,10 +1254,39 @@
    *
    */
   bool IsAmpdu (Ptr<const Packet> packet, const WifiMacHeader hdr);
+  /**
+   * Insert in a temporary queue.
+   * It is only used with a RTS/CTS exchange for an A-MPDU transmission.
+   */
+  void InsertInTxQueue (Ptr<const Packet> packet, const WifiMacHeader &hdr, Time tStamp);
+  /**
+   * Perform MSDU aggregation for a given MPDU in an A-MPDU
+   *
+   * \param packet packet picked for aggregation
+   * \param hdr 802.11 header for packet picked for aggregation
+   * \param tstamp timestamp
+   * \param currentAmpduPacket current A-MPDU packet
+   * \param blockAckSize size of the piggybacked block ack request
+   *
+   * \return the aggregate if MSDU aggregation succeeded, 0 otherwise
+   */
+  Ptr<Packet> PerformMsduAggregation(Ptr<const Packet> packet, WifiMacHeader *hdr, Time *tstamp, Ptr<Packet> currentAmpduPacket, uint16_t blockAckSize);
+
 
   Ptr<WifiPhy> m_phy; //!< Pointer to WifiPhy (actually send/receives frames)
   Ptr<WifiRemoteStationManager> m_stationManager; //!< Pointer to WifiRemoteStationManager (rate control)
   MacLowRxCallback m_rxCallback; //!< Callback to pass packet up
+    
+  /**
+   * A struct for packet, Wifi header, and timestamp.
+   */
+  typedef struct
+  {
+    Ptr<const Packet> packet;
+    WifiMacHeader hdr;
+    Time timestamp;
+  } Item;
+
   /**
    * typedef for an iterator for a list of MacLowDcfListener.
    */
@@ -1313,13 +1354,14 @@
   Agreements m_bAckAgreements;
   BlockAckCaches m_bAckCaches;
 
-  typedef std::map<AcIndex, MacLowBlockAckEventListener*> QueueListeners;
+  typedef std::map<AcIndex, MacLowAggregationCapableTransmissionListener*> QueueListeners;
   QueueListeners m_edcaListeners;
   bool m_ctsToSelfSupported;          //!< Flag whether CTS-to-self is supported
   uint8_t m_sentMpdus;                //!< Number of transmitted MPDUs in an A-MPDU that have not been acknowledged yet
   Ptr<WifiMacQueue> m_aggregateQueue; //!< Queue used for MPDU aggregation
-  WifiMode m_currentMode;             //!< mode used for the current packet transmission
+  WifiTxVector m_currentTxVector;     //!< TXVECTOR used for the current packet transmission
   bool m_receivedAtLeastOneMpdu;      //!< Flag whether an MPDU has already been successfully received while receiving an A-MPDU
+  std::vector<Item> m_txPackets;      //!< Contain temporary items to be sent with the next A-MPDU transmission, once RTS/CTS exchange has succeeded. It is not used in other cases.
 };
 
 } // namespace ns3
diff -Naur ns-3.22/src/wifi/model/mgt-headers.cc ns-3.23/src/wifi/model/mgt-headers.cc
--- ns-3.22/src/wifi/model/mgt-headers.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/mgt-headers.cc	2015-05-13 11:05:27.000000000 -0700
@@ -81,6 +81,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtProbeRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtProbeRequestHeader> ()
   ;
   return tid;
@@ -181,6 +182,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtProbeResponseHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtProbeResponseHeader> ()
   ;
   return tid;
@@ -311,6 +313,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtAssocRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtAssocRequestHeader> ()
   ;
   return tid;
@@ -413,6 +416,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtAssocResponseHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtAssocResponseHeader> ()
   ;
   return tid;
@@ -431,7 +435,7 @@
   size += 2; // aid
   size += m_rates.GetSerializedSize ();
   size += m_rates.extended.GetSerializedSize ();
-size += m_htCapability.GetSerializedSize();
+  size += m_htCapability.GetSerializedSize();
   return size;
 }
 
@@ -462,7 +466,7 @@
   m_aid = i.ReadLsbtohU16 ();
   i = m_rates.Deserialize (i);
   i = m_rates.extended.DeserializeIfPresent (i);
- i = m_htCapability.DeserializeIfPresent (i);
+  i = m_htCapability.DeserializeIfPresent (i);
   return i.GetDistanceFrom (start);
 }
 /**********************************************************
@@ -479,7 +483,6 @@
                              WifiActionHeader::ActionValue action)
 {
   m_category = type;
-
   switch (type)
     {
     case BLOCK_ACK:
@@ -487,22 +490,25 @@
         m_actionValue = action.blockAck;
         break;
       }
-    case MESH_PEERING_MGT:
+    case MESH:  
       {
-        m_actionValue = action.peerLink;
+        m_actionValue = action.meshAction;
         break;
       }
-    case MESH_PATH_SELECTION:
+    case MULTIHOP: 
       {
-        m_actionValue = action.pathSelection;
+        m_actionValue = action.multihopAction;
         break;
       }
-    case MESH_LINK_METRIC:
-    case MESH_INTERWORKING:
-    case MESH_RESOURCE_COORDINATION:
-    case MESH_PROXY_FORWARDING:
+    case SELF_PROTECTED:
+      {
+        m_actionValue = action.selfProtectedAction;
+        break;
+      } 
     case VENDOR_SPECIFIC_ACTION:
-      break;
+      {
+        break;
+      } 
     }
 }
 WifiActionHeader::CategoryValue
@@ -512,30 +518,25 @@
     {
     case BLOCK_ACK:
       return BLOCK_ACK;
-    case MESH_PEERING_MGT:
-      return MESH_PEERING_MGT;
-    case MESH_LINK_METRIC:
-      return MESH_LINK_METRIC;
-    case MESH_PATH_SELECTION:
-      return MESH_PATH_SELECTION;
-    case MESH_INTERWORKING:
-      return MESH_INTERWORKING;
-    case MESH_RESOURCE_COORDINATION:
-      return MESH_RESOURCE_COORDINATION;
-    case MESH_PROXY_FORWARDING:
-      return MESH_PROXY_FORWARDING;
+    case MESH:
+      return MESH;
+    case MULTIHOP:
+      return MULTIHOP;
+    case SELF_PROTECTED:
+      return SELF_PROTECTED;
     case VENDOR_SPECIFIC_ACTION:
       return VENDOR_SPECIFIC_ACTION;
     default:
       NS_FATAL_ERROR ("Unknown action value");
-      return MESH_PEERING_MGT;
+      return SELF_PROTECTED;
     }
 }
 WifiActionHeader::ActionValue
 WifiActionHeader::GetAction ()
 {
   ActionValue retval;
-  retval.peerLink = PEER_LINK_OPEN; // Needs to be initialized to something to quiet valgrind in default cases
+  retval.selfProtectedAction = PEER_LINK_OPEN; // Needs to be initialized to something to quiet valgrind in default cases
+ 
   switch (m_category)
     {
     case BLOCK_ACK:
@@ -550,50 +551,92 @@
         case BLOCK_ACK_DELBA:
           retval.blockAck = BLOCK_ACK_DELBA;
           break ;
-        }
+       }
       break ;
-      
-    case MESH_PEERING_MGT:
+    case SELF_PROTECTED:
       switch (m_actionValue)
         {
         case PEER_LINK_OPEN:
-          retval.peerLink = PEER_LINK_OPEN;
-          break ;
+          retval.selfProtectedAction = PEER_LINK_OPEN;
+          break;
         case PEER_LINK_CONFIRM:
-          retval.peerLink = PEER_LINK_CONFIRM;
-          break ;
+          retval.selfProtectedAction = PEER_LINK_CONFIRM;
+          break;
         case PEER_LINK_CLOSE:
-          retval.peerLink = PEER_LINK_CLOSE;
-          break ;
+          retval.selfProtectedAction = PEER_LINK_CLOSE;
+          break;
+        case GROUP_KEY_INFORM:
+          retval.selfProtectedAction = GROUP_KEY_INFORM;
+          break;
+        case GROUP_KEY_ACK:
+          retval.selfProtectedAction = GROUP_KEY_ACK;
+          break;
         default:
           NS_FATAL_ERROR ("Unknown mesh peering management action code");
-          retval.peerLink = PEER_LINK_OPEN; /* quiet compiler */
+          retval.selfProtectedAction = PEER_LINK_OPEN; /* quiet compiler */
         }
-      break ;
+       break ;
       
-    case MESH_PATH_SELECTION:
+    case MESH:
       switch (m_actionValue)
         {
+        case LINK_METRIC_REPORT:
+          retval.meshAction = LINK_METRIC_REPORT;
+          break;
         case PATH_SELECTION:
-          retval.pathSelection = PATH_SELECTION;
-          break ;
+          retval.meshAction = PATH_SELECTION;
+          break;
+        case PORTAL_ANNOUNCEMENT:
+          retval.meshAction = PORTAL_ANNOUNCEMENT;
+          break;
+        case CONGESTION_CONTROL_NOTIFICATION:
+          retval.meshAction = CONGESTION_CONTROL_NOTIFICATION;
+         break;
+        case MDA_SETUP_REQUEST:
+          retval.meshAction = MDA_SETUP_REQUEST;
+         break;
+        case MDA_SETUP_REPLY:
+          retval.meshAction = MDA_SETUP_REPLY;
+          break;
+        case MDAOP_ADVERTISMENT_REQUEST:
+          retval.meshAction = MDAOP_ADVERTISMENT_REQUEST;
+          break;
+        case MDAOP_ADVERTISMENTS:
+          retval.meshAction = MDAOP_ADVERTISMENTS;
+          break;
+        case MDAOP_SET_TEARDOWN:
+          retval.meshAction = MDAOP_SET_TEARDOWN;
+          break;
+        case TBTT_ADJUSTMENT_REQUEST:
+          retval.meshAction = TBTT_ADJUSTMENT_REQUEST;
+          break;
+        case TBTT_ADJUSTMENT_RESPONSE:
+          retval.meshAction = TBTT_ADJUSTMENT_RESPONSE;
+          break;
         default:
-          NS_FATAL_ERROR ("Unknown mesh path selection action code");
-          retval.peerLink = PEER_LINK_OPEN; /* quiet compiler */
+          NS_FATAL_ERROR ("Unknown mesh peering management action code");
+          retval.selfProtectedAction = PEER_LINK_OPEN; /* quiet compiler */
         }
-      break ;
-    case VENDOR_SPECIFIC_ACTION:
-      break ;
-    case MESH_LINK_METRIC:
-    // not yet supported
-    case MESH_INTERWORKING:
-    // not yet supported
-    case MESH_RESOURCE_COORDINATION:
-    // not yet supported
-    default:
+      break;
+  
+    case MULTIHOP: //not yet supported
+      switch (m_actionValue)
+        {
+        case PROXY_UPDATE:                    //(not used so far)
+          retval.multihopAction = PROXY_UPDATE;
+          break;
+        case PROXY_UPDATE_CONFIRMATION:       //(not used so far)
+          retval.multihopAction = PROXY_UPDATE;
+          break;
+        default:
+          NS_FATAL_ERROR ("Unknown mesh peering management action code");
+          retval.selfProtectedAction = PEER_LINK_OPEN; /* quiet compiler */
+        }
+      break;
+      default:
       NS_FATAL_ERROR ("Unsupported mesh action");
-      retval.peerLink = PEER_LINK_OPEN; /* quiet compiler */
-    }
+      retval.selfProtectedAction = PEER_LINK_OPEN; /* quiet compiler */
+      }
   return retval;
 }
 TypeId
@@ -601,6 +644,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiActionHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiActionHeader> ();
   return tid;
 }
@@ -651,6 +695,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtAddBaRequestHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtAddBaRequestHeader> ();
   return tid;
 }
@@ -827,6 +872,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtAddBaResponseHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtAddBaResponseHeader> ()
   ;
   return tid;
@@ -991,6 +1037,7 @@
 {
   static TypeId tid = TypeId ("ns3::MgtDelBaHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MgtDelBaHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/mgt-headers.h ns-3.23/src/wifi/model/mgt-headers.h
--- ns-3.22/src/wifi/model/mgt-headers.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/mgt-headers.h	2015-05-13 11:05:27.000000000 -0700
@@ -339,61 +339,51 @@
   WifiActionHeader ();
   ~WifiActionHeader ();
 
-  /**
-   * Compatible with open80211s implementation
-   * Category values - see 802.11-2012 Table 8-38
-   */
-  enum CategoryValue
+  /*
+   * Compatible with table 8-38 IEEE 802.11, Part11, (Year 2012)
+   * Category values - see 802.11-2012 Table 8-38 */
+  
+  enum CategoryValue //table 8-38 staring from IEEE 802.11, Part11, (Year 2012)
   {
     BLOCK_ACK = 3,
-    MESH_PEERING_MGT = 30,
-    MESH_LINK_METRIC = 31,
-    MESH_PATH_SELECTION = 32,
-    MESH_INTERWORKING = 33,
-    MESH_RESOURCE_COORDINATION = 34,
-    MESH_PROXY_FORWARDING = 35,
+    MESH = 13,                  //Category: Mesh
+    MULTIHOP = 14,              //(not used so far)
+    SELF_PROTECTED = 15,        //Category: Self Protected
     // since vendor specific action has no stationary Action value,the parse process is not here.
     // refer to vendor-specific-action in wave module.
     VENDOR_SPECIFIC_ACTION = 127,
   };
-  /**
-   * Compatible with open80211s implementation
-   */
-  enum PeerLinkMgtActionValue
-  {
-    PEER_LINK_OPEN = 0,
-    PEER_LINK_CONFIRM = 1,
-    PEER_LINK_CLOSE = 2,
-  };
-  enum LinkMetricActionValue
+ 
+  enum SelfProtectedActionValue //Category: 15 (Self Protected)
   {
-    LINK_METRIC_REQUEST = 0,
-    LINK_METRIC_REPORT,
+    PEER_LINK_OPEN = 1,         //Mesh Peering Open
+    PEER_LINK_CONFIRM = 2,      //Mesh Peering Confirm
+    PEER_LINK_CLOSE = 3,        //Mesh Peering Close
+    GROUP_KEY_INFORM = 4,       //Mesh Group Key Inform
+    GROUP_KEY_ACK = 5,          //Mesh Group Key Acknowledge
   };
-  /**
-   * Compatible with open80211s implementation
-   */
-  enum PathSelectionActionValue
-  {
-    PATH_SELECTION = 0,
-  };
-  enum InterworkActionValue
+
+  enum MultihopActionValue
   {
-    PORTAL_ANNOUNCEMENT = 0,
+    PROXY_UPDATE = 0,                   //(not used so far)
+    PROXY_UPDATE_CONFIRMATION = 1,      //(not used so far)
   };
-  enum ResourceCoordinationActionValue
+
+  enum MeshActionValue
   {
-    CONGESTION_CONTROL_NOTIFICATION = 0,
-    MDA_SETUP_REQUEST,
-    MDA_SETUP_REPLY,
-    MDAOP_ADVERTISMENT_REQUEST,
-    MDAOP_ADVERTISMENTS,
-    MDAOP_SET_TEARDOWN,
-    BEACON_TIMING_REQUEST,
-    BEACON_TIMING_RESPONSE,
-    TBTT_ADJUSTMENT_REQUEST,
-    MESH_CHANNEL_SWITCH_ANNOUNCEMENT,
+    LINK_METRIC_REPORT=0,               //Action Value:0 in Category 13: Mesh
+    PATH_SELECTION = 1,                 //Action Value:1 in Category 13: Mesh
+    PORTAL_ANNOUNCEMENT = 2,            //Action Value:2 in Category 13: Mesh
+    CONGESTION_CONTROL_NOTIFICATION = 3,//Action Value:3 in Category 13: Mesh
+    MDA_SETUP_REQUEST=4,                //Action Value:4 in Category 13: Mesh MCCA-Setup-Request               (not used so far)
+    MDA_SETUP_REPLY=5,                  //Action Value:5 in Category 13: Mesh MCCA-Setup-Reply                 (not used so far)
+    MDAOP_ADVERTISMENT_REQUEST=6,       //Action Value:6 in Category 13: Mesh MCCA-Advertisement-Request       (not used so far)
+    MDAOP_ADVERTISMENTS=7,              //Action Value:7 in Category 13: Mesh                                  (not used so far)
+    MDAOP_SET_TEARDOWN=8,               //Action Value:8 in Category 13: Mesh                                  (not used so far)
+    TBTT_ADJUSTMENT_REQUEST=9,          //Action Value:9 in Category 13: Mesh                                  (not used so far)
+    TBTT_ADJUSTMENT_RESPONSE=10,        //Action Value:10 in Category 13: Mesh                                  (not used so far)
   };
+
   /**
    * Block ACK action field values
    * See 802.11 Table 8-202
@@ -404,16 +394,16 @@
     BLOCK_ACK_ADDBA_RESPONSE = 1,
     BLOCK_ACK_DELBA = 2
   };
+
+
   /**
    * typedef for union of different ActionValues
    */
   typedef union
   {
-    enum PeerLinkMgtActionValue peerLink;
-    enum LinkMetricActionValue linkMetrtic;
-    enum PathSelectionActionValue pathSelection;
-    enum InterworkActionValue interwork;
-    enum ResourceCoordinationActionValue resourceCoordination;
+    enum MeshActionValue meshAction;
+    enum MultihopActionValue multihopAction;
+    enum SelfProtectedActionValue selfProtectedAction;    
     enum BlockAckActionValue blockAck;
   } ActionValue;
   /**
diff -Naur ns-3.22/src/wifi/model/minstrel-wifi-manager.cc ns-3.23/src/wifi/model/minstrel-wifi-manager.cc
--- ns-3.22/src/wifi/model/minstrel-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/minstrel-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -91,6 +91,7 @@
 {
   static TypeId tid = TypeId ("ns3::MinstrelWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MinstrelWifiManager> ()
     .AddAttribute ("UpdateStatistics",
                    "The interval between updating statistics table ",
diff -Naur ns-3.22/src/wifi/model/mpdu-aggregator.cc ns-3.23/src/wifi/model/mpdu-aggregator.cc
--- ns-3.22/src/wifi/model/mpdu-aggregator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/mpdu-aggregator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,6 +32,7 @@
 MpduAggregator::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::MpduAggregator")
+    .SetGroupName ("Wifi")
     .SetParent<Object> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/mpdu-standard-aggregator.cc ns-3.23/src/wifi/model/mpdu-standard-aggregator.cc
--- ns-3.22/src/wifi/model/mpdu-standard-aggregator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/mpdu-standard-aggregator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::MpduStandardAggregator")
     .SetParent<MpduAggregator> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MpduStandardAggregator> ()
     .AddAttribute ("MaxAmpduSize", "Max length in bytes of an A-MPDU",
                    UintegerValue (65535),
diff -Naur ns-3.22/src/wifi/model/msdu-aggregator.cc ns-3.23/src/wifi/model/msdu-aggregator.cc
--- ns-3.22/src/wifi/model/msdu-aggregator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/msdu-aggregator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -33,6 +33,7 @@
 {
   static TypeId tid = TypeId ("ns3::MsduAggregator")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/wifi/model/msdu-standard-aggregator.cc ns-3.23/src/wifi/model/msdu-standard-aggregator.cc
--- ns-3.22/src/wifi/model/msdu-standard-aggregator.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/msdu-standard-aggregator.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::MsduStandardAggregator")
     .SetParent<MsduAggregator> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<MsduStandardAggregator> ()
     .AddAttribute ("MaxAmsduSize", "Max length in byte of an A-MSDU",
                    UintegerValue (7935),
diff -Naur ns-3.22/src/wifi/model/nist-error-rate-model.cc ns-3.23/src/wifi/model/nist-error-rate-model.cc
--- ns-3.22/src/wifi/model/nist-error-rate-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/nist-error-rate-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::NistErrorRateModel")
     .SetParent<ErrorRateModel> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<NistErrorRateModel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/onoe-wifi-manager.cc ns-3.23/src/wifi/model/onoe-wifi-manager.cc
--- ns-3.22/src/wifi/model/onoe-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/onoe-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -55,6 +55,7 @@
 {
   static TypeId tid = TypeId ("ns3::OnoeWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<OnoeWifiManager> ()
     .AddAttribute ("UpdatePeriod",
                    "The interval between decisions about rate control changes",
diff -Naur ns-3.22/src/wifi/model/parf-wifi-manager.cc ns-3.23/src/wifi/model/parf-wifi-manager.cc
--- ns-3.22/src/wifi/model/parf-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/parf-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -62,6 +62,7 @@
 {
   static TypeId tid = TypeId ("ns3::ParfWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<ParfWifiManager> ()
     .AddAttribute ("AttemptThreshold",
                    "The minimum number of transmission attempts to try a new power or rate.",
diff -Naur ns-3.22/src/wifi/model/qos-tag.cc ns-3.23/src/wifi/model/qos-tag.cc
--- ns-3.22/src/wifi/model/qos-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/qos-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -30,6 +30,7 @@
 {
   static TypeId tid = TypeId ("ns3::QosTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<QosTag> ()
     .AddAttribute ("tid", "The tid that indicates AC which packet belongs",
                    UintegerValue (0),
diff -Naur ns-3.22/src/wifi/model/regular-wifi-mac.cc ns-3.23/src/wifi/model/regular-wifi-mac.cc
--- ns-3.22/src/wifi/model/regular-wifi-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/regular-wifi-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -651,6 +651,7 @@
 {
   static TypeId tid = TypeId ("ns3::RegularWifiMac")
     .SetParent<WifiMac> ()
+    .SetGroupName ("Wifi")
     .AddAttribute ("QosSupported",
                    "This Boolean attribute is set to enable 802.11e/WMM-style QoS support at this STA",
                    BooleanValue (false),
diff -Naur ns-3.22/src/wifi/model/rraa-wifi-manager.cc ns-3.23/src/wifi/model/rraa-wifi-manager.cc
--- ns-3.22/src/wifi/model/rraa-wifi-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/rraa-wifi-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -59,6 +59,7 @@
 {
   static TypeId tid = TypeId ("ns3::RraaWifiManager")
     .SetParent<WifiRemoteStationManager> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<RraaWifiManager> ()
     .AddAttribute ("Basic",
                    "If true the RRAA-BASIC algorithm will be used, otherwise the RRAA wil be used",
diff -Naur ns-3.22/src/wifi/model/snr-tag.cc ns-3.23/src/wifi/model/snr-tag.cc
--- ns-3.22/src/wifi/model/snr-tag.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/snr-tag.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,7 @@
 {
   static TypeId tid = TypeId ("ns3::SnrTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<SnrTag> ()
     .AddAttribute ("Snr", "The snr of the last packet received",
                    DoubleValue (0.0),
diff -Naur ns-3.22/src/wifi/model/sta-wifi-mac.cc ns-3.23/src/wifi/model/sta-wifi-mac.cc
--- ns-3.22/src/wifi/model/sta-wifi-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/sta-wifi-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -66,6 +66,7 @@
 {
   static TypeId tid = TypeId ("ns3::StaWifiMac")
     .SetParent<RegularWifiMac> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<StaWifiMac> ()
     .AddAttribute ("ProbeRequestTimeout", "The interval between two consecutive probe request attempts.",
                    TimeValue (Seconds (0.05)),
diff -Naur ns-3.22/src/wifi/model/wifi-channel.cc ns-3.23/src/wifi/model/wifi-channel.cc
--- ns-3.22/src/wifi/model/wifi-channel.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -42,6 +42,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiChannel")
     .SetParent<Channel> ()
+    .SetGroupName ("Wifi")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/wifi/model/wifi-information-element-vector.cc ns-3.23/src/wifi/model/wifi-information-element-vector.cc
--- ns-3.22/src/wifi/model/wifi-information-element-vector.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-information-element-vector.cc	2015-05-13 11:05:27.000000000 -0700
@@ -43,6 +43,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiInformationElementVector")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiInformationElementVector> ();
   return tid;
 }
diff -Naur ns-3.22/src/wifi/model/wifi-mac.cc ns-3.23/src/wifi/model/wifi-mac.cc
--- ns-3.22/src/wifi/model/wifi-mac.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-mac.cc	2015-05-13 11:05:27.000000000 -0700
@@ -139,6 +139,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiMac")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddAttribute ("CtsTimeout", "When this timeout expires, the RTS/CTS handshake has failed.",
                    TimeValue (GetDefaultCtsAckTimeout ()),
                    MakeTimeAccessor (&WifiMac::SetCtsTimeout,
@@ -373,8 +374,6 @@
 {
   Configure80211g ();
   SetRifs(MicroSeconds (2));
-  SetCtsTimeout (MicroSeconds (10 + 52 + 20 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2));
-  SetAckTimeout (MicroSeconds (10 + 52 + 20 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2));
   SetBasicBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultBasicBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2);
   SetCompressedBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultCompressedBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2);
 }
@@ -383,8 +382,6 @@
 {
   Configure80211a ();
   SetRifs(MicroSeconds (2));
-  SetCtsTimeout (MicroSeconds (10 + 52 + 20 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2));
-  SetAckTimeout (MicroSeconds (10 + 52 + 20 + GetDefaultMaxPropagationDelay ().GetMicroSeconds () * 2));
   SetBasicBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultBasicBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2);
   SetCompressedBlockAckTimeout (GetSifs () + GetSlot () + GetDefaultCompressedBlockAckDelay () + GetDefaultMaxPropagationDelay () * 2);
 }
diff -Naur ns-3.22/src/wifi/model/wifi-mac-header.cc ns-3.23/src/wifi/model/wifi-mac-header.cc
--- ns-3.22/src/wifi/model/wifi-mac-header.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-mac-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -956,6 +956,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiMacHeader")
     .SetParent<Header> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiMacHeader> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/wifi-mac-queue.cc ns-3.23/src/wifi/model/wifi-mac-queue.cc
--- ns-3.22/src/wifi/model/wifi-mac-queue.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-mac-queue.cc	2015-05-13 11:05:27.000000000 -0700
@@ -45,6 +45,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiMacQueue")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiMacQueue> ()
     .AddAttribute ("MaxPacketNumber", "If a packet arrives when there are already this number of packets, it is dropped.",
                    UintegerValue (400),
diff -Naur ns-3.22/src/wifi/model/wifi-mac-trailer.cc ns-3.23/src/wifi/model/wifi-mac-trailer.cc
--- ns-3.22/src/wifi/model/wifi-mac-trailer.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-mac-trailer.cc	2015-05-13 11:05:27.000000000 -0700
@@ -37,6 +37,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiMacTrailer")
     .SetParent<Trailer> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiMacTrailer> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/wifi-net-device.cc ns-3.23/src/wifi/model/wifi-net-device.cc
--- ns-3.22/src/wifi/model/wifi-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -42,6 +42,7 @@
   static TypeId tid = TypeId ("ns3::WifiNetDevice")
     .SetParent<NetDevice> ()
     .AddConstructor<WifiNetDevice> ()
+    .SetGroupName ("Wifi")
     .AddAttribute ("Mtu", "The MAC-level Maximum Transmission Unit",
                    UintegerValue (MAX_MSDU_SIZE - LLC_SNAP_HEADER_LENGTH),
                    MakeUintegerAccessor (&WifiNetDevice::SetMtu,
diff -Naur ns-3.22/src/wifi/model/wifi-phy.cc ns-3.23/src/wifi/model/wifi-phy.cc
--- ns-3.22/src/wifi/model/wifi-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-phy.cc	2015-05-13 11:05:27.000000000 -0700
@@ -55,6 +55,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiPhy")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddTraceSource ("PhyTxBegin",
                      "Trace source indicating a packet "
                      "has begun transmitting over the channel medium",
@@ -169,7 +170,7 @@
 
 //return L-SIG
 Time
-WifiPhy::GetPlcpHtSigHeaderDuration (WifiMode payloadMode, WifiPreamble preamble)
+WifiPhy::GetPlcpHtSigHeaderDuration (WifiPreamble preamble)
 {
          switch (preamble)
             {
@@ -578,11 +579,21 @@
   WifiMode payloadMode=txvector.GetMode();
   Time duration = GetPlcpPreambleDuration (payloadMode, preamble)
     + GetPlcpHeaderDuration (payloadMode, preamble)
-    + GetPlcpHtSigHeaderDuration (payloadMode, preamble)
+    + GetPlcpHtSigHeaderDuration (preamble)
     + GetPlcpHtTrainingSymbolDuration (preamble, txvector)
     + GetPayloadDuration (size, txvector, preamble, frequency, packetType, incFlag);
   return duration;
 }
+Time
+WifiPhy::CalculatePlcpDuration (WifiTxVector txvector, WifiPreamble preamble)
+{
+  WifiMode payloadMode=txvector.GetMode();
+  Time duration = GetPlcpPreambleDuration (payloadMode, preamble)
+    + GetPlcpHeaderDuration (payloadMode, preamble)
+    + GetPlcpHtSigHeaderDuration (preamble)
+    + GetPlcpHtTrainingSymbolDuration (preamble, txvector);
+  return duration;
+}
 
 void
 WifiPhy::NotifyTxBegin (Ptr<const Packet> packet)
diff -Naur ns-3.22/src/wifi/model/wifi-phy.h ns-3.23/src/wifi/model/wifi-phy.h
--- ns-3.22/src/wifi/model/wifi-phy.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-phy.h	2015-05-13 11:05:27.000000000 -0700
@@ -160,10 +160,10 @@
   /**
    * arg1: packet received successfully
    * arg2: snr of packet
-   * arg3: mode of packet
+   * arg3: TXVECTOR of packet
    * arg4: type of preamble used for packet.
    */
-  typedef Callback<void,Ptr<Packet>, double, WifiMode, enum WifiPreamble> RxOkCallback;
+  typedef Callback<void,Ptr<Packet>, double, WifiTxVector, enum WifiPreamble> RxOkCallback;
   /**
    * arg1: packet received unsuccessfully
    * arg2: snr of packet
@@ -295,6 +295,13 @@
    *          the transmission of these bytes.
    */
   Time CalculateTxDuration (uint32_t size, WifiTxVector txvector, enum WifiPreamble preamble, double frequency, uint8_t packetType, uint8_t incFlag);
+  
+  /**
+   * \param txvector the transmission parameters used for this packet
+   * \param preamble the type of preamble to use for this packet.
+   * \return the total amount of time this PHY will stay busy for the transmission of the plcp.
+   */
+  Time CalculatePlcpDuration (WifiTxVector txvector, enum WifiPreamble preamble);
 
   /**
    * \param preamble the type of preamble
@@ -311,12 +318,11 @@
    */
   static WifiMode GetMFPlcpHeaderMode (WifiMode payloadMode, WifiPreamble preamble);
   /** 
-   * \param payloadMode the WifiMode use for the transmission of the payload
    * \param preamble the type of preamble
    * 
    * \return the duration of the HT-SIG in Mixed Format and greenfield format PLCP header 
    */
-  static Time GetPlcpHtSigHeaderDuration (WifiMode payloadMode, WifiPreamble preamble);
+  static Time GetPlcpHtSigHeaderDuration (WifiPreamble preamble);
 
 
   /** 
diff -Naur ns-3.22/src/wifi/model/wifi-phy-state-helper.cc ns-3.23/src/wifi/model/wifi-phy-state-helper.cc
--- ns-3.22/src/wifi/model/wifi-phy-state-helper.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-phy-state-helper.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,6 +34,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiPhyStateHelper")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<WifiPhyStateHelper> ()
     .AddTraceSource ("State",
                      "The state of the PHY layer",
@@ -414,14 +415,14 @@
 }
 
 void
-WifiPhyStateHelper::SwitchFromRxEndOk (Ptr<Packet> packet, double snr, WifiMode mode, enum WifiPreamble preamble)
+WifiPhyStateHelper::SwitchFromRxEndOk (Ptr<Packet> packet, double snr, WifiTxVector txVector, enum WifiPreamble preamble)
 {
-  m_rxOkTrace (packet, snr, mode, preamble);
+  m_rxOkTrace (packet, snr, txVector.GetMode(), preamble);
   NotifyRxEndOk ();
   DoSwitchFromRx ();
   if (!m_rxOkCallback.IsNull ())
     {
-      m_rxOkCallback (packet, snr, mode, preamble);
+      m_rxOkCallback (packet, snr, txVector, preamble);
     }
 
 }
diff -Naur ns-3.22/src/wifi/model/wifi-phy-state-helper.h ns-3.23/src/wifi/model/wifi-phy-state-helper.h
--- ns-3.22/src/wifi/model/wifi-phy-state-helper.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-phy-state-helper.h	2015-05-13 11:05:27.000000000 -0700
@@ -157,10 +157,10 @@
    *
    * \param packet the successfully received packet
    * \param snr the SNR of the received packet
-   * \param mode the transmission mode of the packet
+   * \param txVector TXVECTOR of the packet
    * \param preamble the preamble of the received packet
    */
-  void SwitchFromRxEndOk (Ptr<Packet> packet, double snr, WifiMode mode, enum WifiPreamble preamble);
+  void SwitchFromRxEndOk (Ptr<Packet> packet, double snr, WifiTxVector txVector, enum WifiPreamble preamble);
   /**
    * Switch from RX after the reception failed.
    *
diff -Naur ns-3.22/src/wifi/model/wifi-remote-station-manager.cc ns-3.23/src/wifi/model/wifi-remote-station-manager.cc
--- ns-3.22/src/wifi/model/wifi-remote-station-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/wifi-remote-station-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -79,6 +79,7 @@
 {
   static TypeId tid = TypeId ("ns3::HighLatencyDataTxVectorTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<HighLatencyDataTxVectorTag> ()  
     ;
   return tid;
@@ -148,6 +149,7 @@
 {
   static TypeId tid = TypeId ("ns3::HighLatencyRtsTxVectorTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<HighLatencyRtsTxVectorTag> ()  
     ;
   return tid;
@@ -216,6 +218,7 @@
 {
   static TypeId tid = TypeId ("ns3::HighLatencyCtsToSelfTxVectorTag")
     .SetParent<Tag> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<HighLatencyCtsToSelfTxVectorTag> ()  
     ;
   return tid;
@@ -257,6 +260,7 @@
 {
   static TypeId tid = TypeId ("ns3::WifiRemoteStationManager")
     .SetParent<Object> ()
+    .SetGroupName ("Wifi")
     .AddAttribute ("IsLowLatency", "If true, we attempt to modelize a so-called low-latency device: a device"
                    " where decisions about tx parameters can be made on a per-packet basis and feedback about the"
                    " transmission of each packet is obtained before sending the next. Otherwise, we modelize a "
@@ -320,6 +324,7 @@
 }
 
 WifiRemoteStationManager::WifiRemoteStationManager ()
+ : m_htSupported (false)
 {
 }
 
@@ -931,8 +936,9 @@
        i != m_bssBasicRateSet.end (); i++)
     {
       if ((!found || i->GetPhyRate () > mode.GetPhyRate ())
-          && i->GetPhyRate () <= reqMode.GetPhyRate ()
-          && i->GetModulationClass () == reqMode.GetModulationClass ())
+          && (i->GetPhyRate () <= reqMode.GetPhyRate ())
+          && ((i->GetModulationClass () == reqMode.GetModulationClass ())
+              || (reqMode.GetModulationClass () == WIFI_MOD_CLASS_HT)))
         {
           mode = *i;
           // We've found a potentially-suitable transmit rate, but we
@@ -942,13 +948,13 @@
         }
     }
   if(HasHtSupported())
-      {
-        if (!found)
-          {
-            uint8_t mcs = GetDefaultMcs (); 
-            mode=  m_wifiPhy->McsToWifiMode (mcs); 
-          }
-        for (WifiMcsListIterator i = m_bssBasicMcsSet.begin ();
+    {
+      if (!found)
+        {
+          uint8_t mcs = GetDefaultMcs ();
+          mode = m_wifiPhy->McsToWifiMode (mcs);
+            
+          for (WifiMcsListIterator i = m_bssBasicMcsSet.begin ();
              i != m_bssBasicMcsSet.end (); i++)
           {
             WifiMode thismode=  m_wifiPhy->McsToWifiMode (*i); 
@@ -963,11 +969,13 @@
                 found = true;
               }
           }
+        }
       }
   // If we found a suitable rate in the BSSBasicRateSet, then we are
   // done and can return that mode.
   if (found)
     {
+      NS_LOG_DEBUG ("WifiRemoteStationManager::GetControlAnswerMode returning " << mode);
       return mode;
     }
 
@@ -1003,8 +1011,9 @@
        */
       if (thismode.IsMandatory ()
           && (!found || thismode.GetPhyRate () > mode.GetPhyRate ())
-          && thismode.GetPhyRate () <= reqMode.GetPhyRate ()
-          && thismode.GetModulationClass () == reqMode.GetModulationClass ())
+          && (thismode.GetPhyRate () <= reqMode.GetPhyRate ())
+          && ((thismode.GetModulationClass () == reqMode.GetModulationClass ()) ||
+             (reqMode.GetModulationClass () == WIFI_MOD_CLASS_HT)))
         {
           mode = thismode;
           // As above; we've found a potentially-suitable transmit
diff -Naur ns-3.22/src/wifi/model/yans-error-rate-model.cc ns-3.23/src/wifi/model/yans-error-rate-model.cc
--- ns-3.22/src/wifi/model/yans-error-rate-model.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/yans-error-rate-model.cc	2015-05-13 11:05:27.000000000 -0700
@@ -36,6 +36,7 @@
 {
   static TypeId tid = TypeId ("ns3::YansErrorRateModel")
     .SetParent<ErrorRateModel> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<YansErrorRateModel> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wifi/model/yans-wifi-channel.cc ns-3.23/src/wifi/model/yans-wifi-channel.cc
--- ns-3.22/src/wifi/model/yans-wifi-channel.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/yans-wifi-channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,6 +41,7 @@
 {
   static TypeId tid = TypeId ("ns3::YansWifiChannel")
     .SetParent<WifiChannel> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<YansWifiChannel> ()
     .AddAttribute ("PropagationLossModel", "A pointer to the propagation loss model attached to this channel.",
                    PointerValue (),
@@ -124,7 +125,7 @@
 YansWifiChannel::Receive (uint32_t i, Ptr<Packet> packet, double *atts,
                           WifiTxVector txVector, WifiPreamble preamble) const
 {
-  m_phyList[i]->StartReceivePacket (packet, *atts, txVector, preamble,*(atts+1), NanoSeconds(*(atts+2)));
+  m_phyList[i]->StartReceivePlcp (packet, *atts, txVector, preamble,*(atts+1), NanoSeconds(*(atts+2)));
   delete[] atts;
 }
 
diff -Naur ns-3.22/src/wifi/model/yans-wifi-phy.cc ns-3.23/src/wifi/model/yans-wifi-phy.cc
--- ns-3.22/src/wifi/model/yans-wifi-phy.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/yans-wifi-phy.cc	2015-05-13 11:05:27.000000000 -0700
@@ -50,6 +50,7 @@
 {
   static TypeId tid = TypeId ("ns3::YansWifiPhy")
     .SetParent<WifiPhy> ()
+    .SetGroupName ("Wifi")
     .AddConstructor<YansWifiPhy> ()
     .AddAttribute ("EnergyDetectionThreshold",
                    "The energy of a received signal should be higher than "
@@ -172,8 +173,10 @@
   :  m_initialized (false),
     m_channelNumber (1),
     m_endRxEvent (),
+    m_endPlcpRxEvent(),
     m_channelStartingFrequency (0),
-    m_mpdusNum(0)
+    m_mpdusNum(0),
+    m_plcpSuccess (false)
 {
   NS_LOG_FUNCTION (this);
   m_random = CreateObject<UniformRandomVariable> ();
@@ -396,6 +399,7 @@
     {
     case YansWifiPhy::RX:
       NS_LOG_DEBUG ("drop packet because of channel switching while reception");
+      m_endPlcpRxEvent.Cancel();
       m_endRxEvent.Cancel ();
       goto switchChannel;
       break;
@@ -513,33 +517,37 @@
 {
   m_state->SetReceiveErrorCallback (callback);
 }
+
 void
-YansWifiPhy::StartReceivePacket (Ptr<Packet> packet,
-                                 double rxPowerDbm,
-                                 WifiTxVector txVector,
-                                 enum WifiPreamble preamble, 
-                                 uint8_t packetType, Time rxDuration)
+YansWifiPhy::StartReceivePlcp (Ptr<Packet> packet,
+                               double rxPowerDbm,
+                               WifiTxVector txVector,
+                               enum WifiPreamble preamble,
+                               uint8_t packetType, Time rxDuration)
 {
+  // This function should be later split to check separately wether plcp preamble and plcp header can be successfully received.
+  // Note: plcp preamble reception is not yet modeled.
   NS_LOG_FUNCTION (this << packet << rxPowerDbm << txVector.GetMode()<< preamble << (uint32_t)packetType);
   AmpduTag ampduTag;
+  
   rxPowerDbm += m_rxGainDb;
   double rxPowerW = DbmToW (rxPowerDbm);
-  WifiMode txMode = txVector.GetMode();
   Time endRx = Simulator::Now () + rxDuration;
+  Time plcpDuration = CalculatePlcpDuration (txVector, preamble);
 
   Ptr<InterferenceHelper::Event> event;
   event = m_interference.Add (packet->GetSize (),
-                              txMode,
+                              txVector,
                               preamble,
                               rxDuration,
-                              rxPowerW,
-		          txVector);  // we need it to calculate duration of HT training symbols
-
+                              rxPowerW);
+    
   switch (m_state->GetState ())
     {
     case YansWifiPhy::SWITCHING:
       NS_LOG_DEBUG ("drop packet because of channel switching");
       NotifyRxDrop (packet);
+      m_plcpSuccess = false;
       /*
        * Packets received on the upcoming channel are added to the event list
        * during the switching state. This way the medium can be correctly sensed
@@ -579,71 +587,79 @@
       break;
     case YansWifiPhy::CCA_BUSY:
     case YansWifiPhy::IDLE:
-      if (rxPowerW > m_edThresholdW)
+      if (rxPowerW > m_edThresholdW) //checked here, no need to check in the payload reception (current implementation assumes constant rx power over the packet duration)
         {
-          if (IsModeSupported (txMode) || IsMcsSupported(txMode))
+          if (preamble == WIFI_PREAMBLE_NONE && m_mpdusNum == 0)
             {
-              if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum == 0)
-                {
-                  //received the first MPDU in an MPDU
-                  m_mpdusNum = ampduTag.GetNoOfMpdus()-1;
-                }
-              else if (preamble == WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
-                {
-                  //received the other MPDUs that are part of the A-MPDU
-                  if (ampduTag.GetNoOfMpdus() < m_mpdusNum)
-                    {
-                      NS_LOG_DEBUG ("Missing MPDU from the A-MPDU " << m_mpdusNum - ampduTag.GetNoOfMpdus());
-                      m_mpdusNum = ampduTag.GetNoOfMpdus();
-                    }
-                  else
-                      m_mpdusNum--;
-                }
-              else if (preamble != WIFI_PREAMBLE_NONE && m_mpdusNum > 0 )
-                {
-                  NS_LOG_DEBUG ("Didn't receive the last MPDUs from an A-MPDU " << m_mpdusNum);
-                  m_mpdusNum = 0;
-                }
-              else if (preamble == WIFI_PREAMBLE_NONE && m_mpdusNum == 0)
-                {
-                  NS_LOG_DEBUG ("drop packet because no preamble has been received");
-                  NotifyRxDrop (packet);
-                  goto maybeCcaBusy;
-                }
-              NS_LOG_DEBUG ("sync to signal (power=" << rxPowerW << "W)");
-              // sync to signal
-              m_state->SwitchToRx (rxDuration);
-              NS_ASSERT (m_endRxEvent.IsExpired ());
-              NotifyRxBegin (packet);
-              m_interference.NotifyRxStart ();
-              m_endRxEvent = Simulator::Schedule (rxDuration, &YansWifiPhy::EndReceive, this,
-                                                  packet,
-                                                  event);
+              NS_LOG_DEBUG ("drop packet because no preamble has been received");
+              NotifyRxDrop (packet);
+              goto maybeCcaBusy;
             }
-          else
+          else if (preamble == WIFI_PREAMBLE_NONE && m_plcpSuccess == false) // A-MPDU reception fails
             {
-              NS_LOG_DEBUG ("drop packet because it was sent using an unsupported mode (" << txMode << ")");
+              NS_LOG_DEBUG ("Drop MPDU because no plcp has been received");
               NotifyRxDrop (packet);
               goto maybeCcaBusy;
             }
+           else if (preamble != WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum == 0)
+            {
+              //received the first MPDU in an MPDU
+              m_mpdusNum = ampduTag.GetNoOfMpdus()-1;
+            }
+           else if (preamble == WIFI_PREAMBLE_NONE && packet->PeekPacketTag (ampduTag) && m_mpdusNum > 0)
+            {
+              //received the other MPDUs that are part of the A-MPDU
+              if (ampduTag.GetNoOfMpdus() < m_mpdusNum)
+                {
+                    NS_LOG_DEBUG ("Missing MPDU from the A-MPDU " << m_mpdusNum - ampduTag.GetNoOfMpdus());
+                    m_mpdusNum = ampduTag.GetNoOfMpdus();
+                }
+              else
+                m_mpdusNum--;
+            }
+          else if (preamble != WIFI_PREAMBLE_NONE && m_mpdusNum > 0 )
+            {
+              NS_LOG_DEBUG ("Didn't receive the last MPDUs from an A-MPDU " << m_mpdusNum);
+              m_mpdusNum = 0;
+            }
+            
+          NS_LOG_DEBUG ("sync to signal (power=" << rxPowerW << "W)");
+          // sync to signal
+          m_state->SwitchToRx (rxDuration);
+          NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
+          NotifyRxBegin (packet);
+          m_interference.NotifyRxStart ();
+            
+          if (preamble != WIFI_PREAMBLE_NONE)
+          {
+            NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
+            m_endPlcpRxEvent = Simulator::Schedule (plcpDuration, &YansWifiPhy::StartReceivePacket, this,
+                                                    packet, txVector, preamble, packetType, event);
+          }
+            
+          NS_ASSERT (m_endRxEvent.IsExpired ());
+          m_endRxEvent = Simulator::Schedule (rxDuration, &YansWifiPhy::EndReceive, this,
+                                              packet, preamble, packetType, event);
         }
       else
         {
           NS_LOG_DEBUG ("drop packet because signal power too Small (" <<
                         rxPowerW << "<" << m_edThresholdW << ")");
           NotifyRxDrop (packet);
+          m_plcpSuccess = false;
           goto maybeCcaBusy;
         }
       break;
     case YansWifiPhy::SLEEP:
       NS_LOG_DEBUG ("drop packet because in sleep mode");
       NotifyRxDrop (packet);
+      m_plcpSuccess = false;
       break;
     }
 
   return;
-
-maybeCcaBusy:
+  
+  maybeCcaBusy:
   // We are here because we have received the first bit of a packet and we are
   // not going to be able to synchronize on it
   // In this model, CCA becomes busy when the aggregation of all signals as
@@ -655,6 +671,45 @@
       m_state->SwitchMaybeToCcaBusy (delayUntilCcaEnd);
     }
 }
+void
+YansWifiPhy::StartReceivePacket (Ptr<Packet> packet,
+                                 WifiTxVector txVector,
+                                 enum WifiPreamble preamble, 
+                                 uint8_t packetType,
+                                 Ptr<InterferenceHelper::Event> event)
+{
+  NS_LOG_FUNCTION (this << packet << txVector.GetMode()<< preamble << (uint32_t)packetType);
+  NS_ASSERT (IsStateRx ());
+  NS_ASSERT (m_endPlcpRxEvent.IsExpired ());
+  AmpduTag ampduTag;
+  WifiMode txMode = txVector.GetMode();
+  
+  struct InterferenceHelper::SnrPer snrPer;
+  snrPer = m_interference.CalculatePlcpHeaderSnrPer (event);
+  
+  NS_LOG_DEBUG ("snr=" << snrPer.snr << ", per=" << snrPer.per);
+
+    if (m_random->GetValue () > snrPer.per) //plcp reception succeeded
+      {
+          if (IsModeSupported (txMode) || IsMcsSupported(txMode))
+            {
+              NS_LOG_DEBUG ("receiving plcp payload"); //endReceive is already scheduled
+              m_plcpSuccess = true;
+            }
+          else //mode is not allowed
+            {
+              NS_LOG_DEBUG ("drop packet because it was sent using an unsupported mode (" << txMode << ")");
+              NotifyRxDrop (packet);
+              m_plcpSuccess = false;
+            }
+      }
+    else //plcp reception failed
+      {
+        NS_LOG_DEBUG ("drop packet because plcp reception failed");
+        NotifyRxDrop (packet);
+        m_plcpSuccess = false;
+      }
+}
 
 void
 YansWifiPhy::SendPacket (Ptr<const Packet> packet, WifiTxVector txVector, WifiPreamble preamble, uint8_t packetType)
@@ -667,7 +722,7 @@
    *  - we are idle
    */
   NS_ASSERT (!m_state->IsStateTx () && !m_state->IsStateSwitching ());
-
+  
   if (m_state->IsStateSleep ())
     {
       NS_LOG_DEBUG ("Dropping packet because in sleep mode");
@@ -678,6 +733,7 @@
   Time txDuration = CalculateTxDuration (packet->GetSize (), txVector, preamble, GetFrequency(), packetType, 1);
   if (m_state->IsStateRx ())
     {
+      m_endPlcpRxEvent.Cancel ();
       m_endRxEvent.Cancel ();
       m_interference.NotifyRxEnd ();
     }
@@ -947,19 +1003,22 @@
 }
 
 void
-YansWifiPhy::EndReceive (Ptr<Packet> packet, Ptr<InterferenceHelper::Event> event)
+YansWifiPhy::EndReceive (Ptr<Packet> packet, enum WifiPreamble preamble, uint8_t packetType, Ptr<InterferenceHelper::Event> event)
 {
   NS_LOG_FUNCTION (this << packet << event);
   NS_ASSERT (IsStateRx ());
   NS_ASSERT (event->GetEndTime () == Simulator::Now ());
 
   struct InterferenceHelper::SnrPer snrPer;
-  snrPer = m_interference.CalculateSnrPer (event);
+  snrPer = m_interference.CalculatePlcpPayloadSnrPer (event);
   m_interference.NotifyRxEnd ();
-
-  NS_LOG_DEBUG ("mode=" << (event->GetPayloadMode ().GetDataRate ()) <<
-                ", snr=" << snrPer.snr << ", per=" << snrPer.per << ", size=" << packet->GetSize ());
-  if (m_random->GetValue () > snrPer.per)
+  
+  if (m_plcpSuccess == true)
+  {
+    NS_LOG_DEBUG ("mode=" << (event->GetPayloadMode ().GetDataRate ()) <<
+                  ", snr=" << snrPer.snr << ", per=" << snrPer.per << ", size=" << packet->GetSize ());
+  
+    if (m_random->GetValue () > snrPer.per)
     {
       NotifyRxEnd (packet);
       uint32_t dataRate500KbpsUnits;
@@ -975,14 +1034,25 @@
       double signalDbm = RatioToDb (event->GetRxPowerW ()) + 30;
       double noiseDbm = RatioToDb (event->GetRxPowerW () / snrPer.snr) - GetRxNoiseFigure () + 30;
       NotifyMonitorSniffRx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble, signalDbm, noiseDbm);
-      m_state->SwitchFromRxEndOk (packet, snrPer.snr, event->GetPayloadMode (), event->GetPreambleType ());
+      m_state->SwitchFromRxEndOk (packet, snrPer.snr, event->GetTxVector (), event->GetPreambleType ());
     }
-  else
+    else
     {
       /* failure. */
       NotifyRxDrop (packet);
       m_state->SwitchFromRxEndError (packet, snrPer.snr);
     }
+  }
+  else
+  {
+    m_state->SwitchFromRxEndError (packet, snrPer.snr); //notify rx end
+  }
+    
+  if (preamble == WIFI_PREAMBLE_NONE && packetType == 2)
+    {
+      m_plcpSuccess = false;
+    }
+    
 }
 
 int64_t
diff -Naur ns-3.22/src/wifi/model/yans-wifi-phy.h ns-3.23/src/wifi/model/yans-wifi-phy.h
--- ns-3.22/src/wifi/model/yans-wifi-phy.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/model/yans-wifi-phy.h	2015-05-13 11:05:27.000000000 -0700
@@ -100,21 +100,35 @@
   double GetChannelFrequencyMhz () const;
 
   /**
-   * Starting receiving the packet (i.e. the first bit of the preamble has arrived).
+   * Starting receiving the plcp of a packet (i.e. the first bit of the preamble has arrived).
    *
    * \param packet the arriving packet
    * \param rxPowerDbm the receive power in dBm
    * \param txVector the TXVECTOR of the arriving packet
    * \param preamble the preamble of the arriving packet
    * \param packetType The type of the received packet (values: 0 not an A-MPDU, 1 corresponds to any packets in an A-MPDU except the last one, 2 is the last packet in an A-MPDU) 
-   * \param rxDuration the duration needed for the reception of the arriving packet
+   * \param rxDuration the duration needed for the reception of the packet
+   */
+  void StartReceivePlcp (Ptr<Packet> packet,
+                         double rxPowerDbm,
+                         WifiTxVector txVector,
+                         WifiPreamble preamble,
+                         uint8_t packetType,
+                         Time rxDuration);
+  /**
+   * Starting receiving the payload of a packet (i.e. the first bit of the packet has arrived).
+   *
+   * \param packet the arriving packet
+   * \param txVector the TXVECTOR of the arriving packet
+   * \param preamble the preamble of the arriving packet
+   * \param packetType The type of the received packet (values: 0 not an A-MPDU, 1 corresponds to any packets in an A-MPDU except the last one, 2 is the last packet in an A-MPDU) 
+   * \param event the corresponding event of the first time the packet arrives
    */
   void StartReceivePacket (Ptr<Packet> packet,
-                           double rxPowerDbm,
                            WifiTxVector txVector,
                            WifiPreamble preamble,
                            uint8_t packetType,
-                           Time rxDuration);
+                           Ptr<InterferenceHelper::Event> event);
 
   /**
    * Sets the RX loss (dB) in the Signal-to-Noise-Ratio due to non-idealities in the receiver.
@@ -462,13 +476,15 @@
    * The last bit of the packet has arrived.
    *
    * \param packet the packet that the last bit has arrived
+   * \param preamble the preamble of the arriving packet
+   * \param packetType The type of the received packet (values: 0 not an A-MPDU, 1 corresponds to any packets in an A-MPDU except the last one, 2 is the last packet in an A-MPDU)
    * \param event the corresponding event of the first time the packet arrives
    */
-  void EndReceive (Ptr<Packet> packet, Ptr<InterferenceHelper::Event> event);
+  void EndReceive (Ptr<Packet> packet, enum WifiPreamble preamble, uint8_t packetType, Ptr<InterferenceHelper::Event> event);
 
 private:
   virtual void DoInitialize (void);
-
+  
   bool     m_initialized;         //!< Flag for runtime initialization
   double   m_edThresholdW;        //!< Energy detection threshold in watts
   double   m_ccaMode1ThresholdW;  //!< Clear channel assessment (CCA) threshold in watts
@@ -533,6 +549,7 @@
   std::vector<uint32_t> m_bssMembershipSelectorSet;
   std::vector<uint8_t> m_deviceMcsSet;
   EventId m_endRxEvent;
+  EventId m_endPlcpRxEvent;
 
   Ptr<UniformRandomVariable> m_random;  //!< Provides uniform random variables.
   double m_channelStartingFrequency;    //!< Standard-dependent center frequency of 0-th channel in MHz
@@ -540,6 +557,7 @@
   InterferenceHelper m_interference;    //!< Pointer to InterferenceHelper
   Time m_channelSwitchDelay;            //!< Time required to switch between channel
   uint16_t m_mpdusNum;                  //!< carries the number of expected mpdus that are part of an A-MPDU
+  bool m_plcpSuccess;                   //!< Flag if the PLCP of the packet or the first MPDU in an A-MPDU has been received
 };
 
 } // namespace ns3
diff -Naur ns-3.22/src/wifi/test/wifi-aggregation-test.cc ns-3.23/src/wifi/test/wifi-aggregation-test.cc
--- ns-3.22/src/wifi/test/wifi-aggregation-test.cc	1969-12-31 16:00:00.000000000 -0800
+++ ns-3.23/src/wifi/test/wifi-aggregation-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -0,0 +1,191 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2015
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Sébastien Deronne <sebastien.deronne@gmail.com>
+ */
+
+#include "ns3/string.h"
+#include "ns3/test.h"
+#include "ns3/object-factory.h"
+#include "ns3/simulator.h"
+#include "ns3/wifi-mac-queue.h"
+#include "ns3/mac-low.h"
+#include "ns3/edca-txop-n.h"
+#include "ns3/yans-wifi-phy.h"
+
+using namespace ns3;
+
+class TwoLevelAggregationTest : public TestCase
+{
+public:
+  TwoLevelAggregationTest ();
+
+private:
+  virtual void DoRun (void);
+  Ptr<MacLow> m_low;
+  Ptr<YansWifiPhy> m_phy;
+  Ptr<EdcaTxopN> m_edca;
+  Ptr<WifiRemoteStationManager> m_manager;
+  ObjectFactory m_factory;
+  Ptr<MpduAggregator> m_mpduAggregator;
+  Ptr<MsduAggregator> m_msduAggregator;
+};
+
+TwoLevelAggregationTest::TwoLevelAggregationTest ()
+  : TestCase ("Check the correctness of two-level aggregation operations")
+{
+}
+
+void
+TwoLevelAggregationTest::DoRun (void)
+{
+  /*
+   * Create and configure phy layer.
+   */
+  m_phy = CreateObject<YansWifiPhy> ();
+  m_phy->ConfigureStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
+
+  /*
+   * Create and configure manager.
+   */
+  m_factory = ObjectFactory ();
+  m_factory.SetTypeId ("ns3::ConstantRateWifiManager");
+  m_factory.Set ("DataMode", StringValue ("OfdmRate65MbpsBW20MHz"));
+  m_manager = m_factory.Create<WifiRemoteStationManager> ();
+  m_manager->SetupPhy(m_phy);
+
+  /*
+   * Create and configure maclayer.
+   */
+  m_low = CreateObject<MacLow> ();
+  m_low->SetPhy(m_phy);
+  m_low->SetWifiRemoteStationManager (m_manager);
+
+  m_edca = CreateObject<EdcaTxopN> ();
+  m_edca->SetLow (m_low);
+  m_edca->SetAccessCategory (AC_BE);
+  m_edca->SetWifiRemoteStationManager (m_manager);
+  m_edca->CompleteConfig ();
+
+  /*
+   * Configure aggregation.
+   */
+  m_factory = ObjectFactory ();
+  m_factory.SetTypeId ("ns3::MsduStandardAggregator");
+  m_factory.Set ("MaxAmsduSize", UintegerValue(4095));
+  m_msduAggregator = m_factory.Create<MsduAggregator> ();
+  m_edca->SetMsduAggregator (m_msduAggregator);
+  
+  m_factory = ObjectFactory ();
+  m_factory.SetTypeId ("ns3::MpduStandardAggregator");
+  m_factory.Set ("MaxAmpduSize", UintegerValue(65535));
+  m_mpduAggregator = m_factory.Create<MpduAggregator> ();
+  m_low->SetMpduAggregator (m_mpduAggregator);
+  
+  /*
+   * Create dummy packets of 1500 bytes and fill mac header fields that will be used for the tests.
+   */
+  Ptr<const Packet> pkt = Create<Packet> (1500);
+  Ptr<Packet> currentAggregatedPacket = Create<Packet> ();
+  WifiMacHeader hdr, peekedHdr;
+  hdr.SetAddr1 (Mac48Address ("00:00:00:00:00:01"));
+  hdr.SetAddr2 (Mac48Address ("00:00:00:00:00:02"));
+  hdr.SetType (WIFI_MAC_QOSDATA);
+  hdr.SetQosTid (0);
+  Time tstamp;
+
+  //-----------------------------------------------------------------------------------------------------
+  
+  /*
+   * Test MSDU aggregation of two packets using MacLow::PerformMsduAggregation.
+   * It checks whether aggregation succeeded: 
+   *      - returned packet should be different from 0;
+   *      - A-MSDU frame size should be 3030 bytes (= 2 packets + headers + padding);
+   *      - one packet should be removed from the queue (the other packet is removed later in MacLow::AggregateToAmpdu) .
+   */
+  m_edca->GetEdcaQueue()->Enqueue(pkt, hdr);
+  m_edca->GetEdcaQueue()->Enqueue(pkt, hdr);
+    
+  Ptr<const Packet> peekedPacket = m_edca->GetEdcaQueue()->PeekByTidAndAddress (&peekedHdr, 0,
+                                                                                WifiMacHeader::ADDR1,
+                                                                                hdr.GetAddr1 (),
+                                                                                &tstamp);
+  m_low->m_currentPacket = peekedPacket->Copy ();
+  m_low->m_currentHdr = peekedHdr;
+  
+  Ptr<Packet> packet = m_low->PerformMsduAggregation(peekedPacket, &peekedHdr, &tstamp, currentAggregatedPacket, 0);
+    
+  bool result = (packet != 0);
+  NS_TEST_EXPECT_MSG_EQ (result, true, "aggregation failed");
+  NS_TEST_EXPECT_MSG_EQ (packet->GetSize(), 3030, "wrong packet size");
+  NS_TEST_EXPECT_MSG_EQ (m_edca->GetEdcaQueue()->GetSize(), 1, "removing packet from EDCA queue failed");
+
+  //-----------------------------------------------------------------------------------------------------
+    
+  /*
+   * Aggregation is refused when the maximum size is reached.
+   * It checks whether MSDU aggregation has been rejected because the maximum MPDU size is set to 0 (returned packet should be equal to 0).
+   * This test is needed to ensure that no packets are removed from the queue in MacLow::PerformMsduAggregation, since aggregation will no occur in MacLow::AggregateToAmpdu.
+   */
+  m_factory = ObjectFactory ();
+  m_factory.SetTypeId ("ns3::MpduStandardAggregator");
+  m_factory.Set ("MaxAmpduSize", UintegerValue(0));
+  m_mpduAggregator = m_factory.Create<MpduAggregator> ();
+  m_low->SetMpduAggregator (m_mpduAggregator);
+  
+  m_edca->GetEdcaQueue()->Enqueue(pkt, hdr);
+  packet = m_low->PerformMsduAggregation(peekedPacket, &peekedHdr, &tstamp, currentAggregatedPacket, 0);
+  
+  result = (packet != 0);
+  NS_TEST_EXPECT_MSG_EQ (result, false, "maximum aggregated frame size check failed");
+
+  //-----------------------------------------------------------------------------------------------------
+  
+  /*
+   * Aggregation does not occur zhen there is no more packets in the queue.
+   * It checks whether MSDU aggregation has been rejected because there is no packets ready in the queue (returned packet should be equal to 0).
+   * This test is needed to ensure that there is no issue when the queue is empty.
+   */
+  m_factory = ObjectFactory ();
+  m_factory.SetTypeId ("ns3::MpduStandardAggregator");
+  m_factory.Set ("MaxAmpduSize", UintegerValue(4095));
+  m_mpduAggregator = m_factory.Create<MpduAggregator> ();
+  m_low->SetMpduAggregator (m_mpduAggregator);
+    
+  m_edca->GetEdcaQueue()->Remove(pkt);
+  m_edca->GetEdcaQueue()->Remove(pkt);
+  packet = m_low->PerformMsduAggregation(peekedPacket, &peekedHdr, &tstamp, currentAggregatedPacket, 0);
+  
+  result = (packet != 0);
+  NS_TEST_EXPECT_MSG_EQ (result, false, "aggregation failed to stop as queue is empty");
+  Simulator::Destroy ();
+}
+
+//-----------------------------------------------------------------------------
+class WifiAggregationTestSuite : public TestSuite
+{
+public:
+  WifiAggregationTestSuite ();
+};
+
+WifiAggregationTestSuite::WifiAggregationTestSuite ()
+  : TestSuite ("aggregation-wifi", UNIT)
+{
+  AddTestCase (new TwoLevelAggregationTest, TestCase::QUICK);
+}
+
+static WifiAggregationTestSuite g_wifiAggregationTestSuite;
diff -Naur ns-3.22/src/wifi/wscript ns-3.23/src/wifi/wscript
--- ns-3.22/src/wifi/wscript	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wifi/wscript	2015-05-13 11:05:27.000000000 -0700
@@ -84,6 +84,7 @@
         'test/tx-duration-test.cc',
         'test/power-rate-adaptation-test.cc',
         'test/wifi-test.cc',
+        'test/wifi-aggregation-test.cc',
         ]
 
     headers = bld(features='ns3header')
diff -Naur ns-3.22/src/wimax/model/bandwidth-manager.cc ns-3.23/src/wimax/model/bandwidth-manager.cc
--- ns-3.22/src/wimax/model/bandwidth-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bandwidth-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -42,7 +42,8 @@
 TypeId BandwidthManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::BandwidthManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/bs-link-manager.cc ns-3.23/src/wimax/model/bs-link-manager.cc
--- ns-3.22/src/wimax/model/bs-link-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bs-link-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -41,7 +41,8 @@
 TypeId BSLinkManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::BSLinkManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/bs-net-device.cc ns-3.23/src/wimax/model/bs-net-device.cc
--- ns-3.22/src/wimax/model/bs-net-device.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bs-net-device.cc	2015-05-13 11:05:27.000000000 -0700
@@ -58,6 +58,8 @@
 
     .SetParent<WimaxNetDevice> ()
 
+    .SetGroupName("Wimax")
+
     .AddConstructor<BaseStationNetDevice> ()
 
     .AddAttribute ("BSScheduler",
diff -Naur ns-3.22/src/wimax/model/bs-scheduler.cc ns-3.23/src/wimax/model/bs-scheduler.cc
--- ns-3.22/src/wimax/model/bs-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bs-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -44,7 +44,7 @@
 TypeId
 BSScheduler::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::BSScheduler").SetParent<Object> ();
+  static TypeId tid = TypeId ("ns3::BSScheduler").SetParent<Object> ().SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/bs-scheduler-rtps.cc ns-3.23/src/wimax/model/bs-scheduler-rtps.cc
--- ns-3.22/src/wimax/model/bs-scheduler-rtps.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bs-scheduler-rtps.cc	2015-05-13 11:05:27.000000000 -0700
@@ -46,7 +46,7 @@
 TypeId
 BSSchedulerRtps::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::BSSchedulerRtps").SetParent<Object> ().AddConstructor<BSSchedulerRtps> ();
+  static TypeId tid = TypeId ("ns3::BSSchedulerRtps").SetParent<Object> ().SetGroupName("Wimax").AddConstructor<BSSchedulerRtps> ();
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/bs-scheduler-simple.cc ns-3.23/src/wimax/model/bs-scheduler-simple.cc
--- ns-3.22/src/wimax/model/bs-scheduler-simple.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bs-scheduler-simple.cc	2015-05-13 11:05:27.000000000 -0700
@@ -43,7 +43,7 @@
 
 TypeId BSSchedulerSimple::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::BSSchedulerSimple").SetParent<Object> ().AddConstructor<BSSchedulerSimple> ();
+  static TypeId tid = TypeId ("ns3::BSSchedulerSimple").SetParent<Object> ().SetGroupName("Wimax").AddConstructor<BSSchedulerSimple> ();
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/bs-uplink-scheduler.cc ns-3.23/src/wimax/model/bs-uplink-scheduler.cc
--- ns-3.22/src/wimax/model/bs-uplink-scheduler.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bs-uplink-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -76,6 +76,7 @@
 {
   static TypeId tid = TypeId ("ns3::UplinkScheduler")
     .SetParent<Object> ()
+    .SetGroupName("Wimax")
   ;
   return tid;
 }
diff -Naur ns-3.22/src/wimax/model/bs-uplink-scheduler-mbqos.cc ns-3.23/src/wimax/model/bs-uplink-scheduler-mbqos.cc
--- ns-3.22/src/wimax/model/bs-uplink-scheduler-mbqos.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bs-uplink-scheduler-mbqos.cc	2015-05-13 11:05:27.000000000 -0700
@@ -58,6 +58,8 @@
 
     .SetParent<UplinkScheduler> ()
 
+    .SetGroupName("Wimax")
+
     .AddAttribute ("WindowInterval",
                    "The time to wait to reset window",
                    TimeValue (Seconds (1.0)),
diff -Naur ns-3.22/src/wimax/model/bs-uplink-scheduler-rtps.cc ns-3.23/src/wimax/model/bs-uplink-scheduler-rtps.cc
--- ns-3.22/src/wimax/model/bs-uplink-scheduler-rtps.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bs-uplink-scheduler-rtps.cc	2015-05-13 11:05:27.000000000 -0700
@@ -71,7 +71,7 @@
 TypeId
 UplinkSchedulerRtps::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::UplinkSchedulerRtps").SetParent<UplinkScheduler> ();
+  static TypeId tid = TypeId ("ns3::UplinkSchedulerRtps").SetParent<UplinkScheduler> ().SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/bs-uplink-scheduler-simple.cc ns-3.23/src/wimax/model/bs-uplink-scheduler-simple.cc
--- ns-3.22/src/wimax/model/bs-uplink-scheduler-simple.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/bs-uplink-scheduler-simple.cc	2015-05-13 11:05:27.000000000 -0700
@@ -75,7 +75,7 @@
 TypeId
 UplinkSchedulerSimple::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::UplinkSchedulerSimple").SetParent<Object> ();
+  static TypeId tid = TypeId ("ns3::UplinkSchedulerSimple").SetParent<Object> ().SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/burst-profile-manager.cc ns-3.23/src/wimax/model/burst-profile-manager.cc
--- ns-3.22/src/wimax/model/burst-profile-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/burst-profile-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -36,7 +36,8 @@
 TypeId BurstProfileManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::BurstProfileManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/connection-manager.cc ns-3.23/src/wimax/model/connection-manager.cc
--- ns-3.22/src/wimax/model/connection-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/connection-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,7 +40,8 @@
 TypeId ConnectionManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::ConnectionManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/default-traces.h ns-3.23/src/wimax/model/default-traces.h
--- ns-3.22/src/wimax/model/default-traces.h	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/default-traces.h	2015-05-13 11:05:27.000000000 -0700
@@ -54,6 +54,22 @@
  * The multipath channel is simulated using the TDL_channel class of
  * the IT++ library.
  *
+ *
+ * The file format should be as follows
+ *
+ * SNR_value1   BER  Blc_ER  STANDARD_DEVIATION  CONFIDENCE_INTERVAL1  CONFIDENCE_INTERVAL2
+ * SNR_value2   BER  Blc_ER  STANDARD_DEVIATION  CONFIDENCE_INTERVAL1  CONFIDENCE_INTERVAL2
+ *  ...          ...  ...     ...                 ...                   ...
+ *
+ *
+ *  Aditional notes: from Esteban Municio   <esteban.municio@urjc.es>
+ *
+ *  This trace file has been edited for the 16 QAM 3/4 modulation (modulation4) since the original SNR traces for
+ *  this modulation were not long enough, giving inflated BER and BLER figures for typical SNR values. Due to the impossibility
+ *  to get the original IT++ environment used for the original traces by the previous authors, the traces of modulation4 have
+ *  been generated using a simple IT++ program simulating the theoretical model of a AWGN channel
+ *  given BER=3/2*erfc(sqrt(k*0.1*(Eb_N0_dB)));
+ *
  * \relates ns3::SNRToBlockErrorRateManager
  * \hideinitializer
  * @{
@@ -254,66 +270,187 @@
     0.00000, 0.00030, 0.00048, 0.00079, 0.00048, 0.00030, 0.00030, 0.00079, 0.00000 }
 };
 
-static const double modulation4[6][115] = {
+static const double modulation4[6][331] = {
 
-  { 20.00, 20.10, 20.20, 20.30, 20.40, 20.50, 20.60, 20.70, 20.80, 20.90, 21.00, 21.10, 21.20, 21.30, 21.40, 21.50,
-    21.60, 21.70, 21.80, 21.90, 22.00, 22.10, 22.20, 22.30, 22.40, 22.50, 22.60, 22.70, 22.80, 22.90, 23.00, 23.10,
-    23.20, 23.30, 23.40, 23.50, 23.60, 23.70, 23.80, 23.90, 24.00, 24.10, 24.20, 24.30, 24.40, 24.50, 24.60, 24.70,
-    24.80, 24.90, 25.00, 25.10, 25.20, 25.30, 25.40, 25.50, 25.60, 25.70, 25.80, 25.90, 26.00, 26.10, 26.20, 26.30,
-    26.40, 26.50, 26.60, 26.70, 26.80, 26.90, 27.10, 27.20, 27.30, 27.40, 27.50, 27.60, 27.70, 27.80, 27.90, 28.00,
-    28.10, 28.20, 28.30, 28.40, 28.50, 28.60, 28.70, 28.80, 28.90, 29.00, 29.10, 29.20, 29.30, 29.40, 29.50, 29.60,
-    29.70, 29.80, 29.90, 30.00, 30.10, 30.20, 30.30, 30.40, 30.50, 30.60, 30.70, 30.80, 30.90, 31.00, 31.10, 31.20,
-    31.30, 31.40, 31.50 },
-
-  { 0.33107, 0.32310, 0.31789, 0.31805, 0.31352, 0.30854, 0.30697, 0.29615, 0.29218, 0.28319, 0.27982, 0.27112, 0.27369,
-    0.26701, 0.26180, 0.25450, 0.25144, 0.24541, 0.23739, 0.23148, 0.23259, 0.23020, 0.22530, 0.21333, 0.20806, 0.20799,
-    0.19834, 0.19916, 0.19431, 0.18956, 0.18273, 0.18543, 0.17783, 0.17627, 0.17182, 0.16563, 0.15979, 0.15714, 0.15541,
-    0.15025, 0.14868, 0.14430, 0.13602, 0.13636, 0.13467, 0.12758, 0.12542, 0.12828, 0.12015, 0.11889, 0.11511, 0.10993,
-    0.10791, 0.10339, 0.10542, 0.10187, 0.09945, 0.09516, 0.08852, 0.09033, 0.09222, 0.08730, 0.08405, 0.08084, 0.08054,
-    0.07719, 0.07267, 0.06947, 0.07170, 0.06786, 0.06610, 0.06346, 0.05817, 0.06174, 0.06139, 0.05859, 0.05682, 0.05319,
-    0.05322, 0.05096, 0.05004, 0.04921, 0.04771, 0.04506, 0.04220, 0.04323, 0.04337, 0.04082, 0.04035, 0.03932, 0.03570,
-    0.03526, 0.03798, 0.03680, 0.03391, 0.03413, 0.03184, 0.02968, 0.02886, 0.02931, 0.02955, 0.02795, 0.02603, 0.02478,
-    0.02541, 0.02669, 0.02407, 0.02403, 0.02353, 0.02260, 0.02004, 0.02105, 0.02135, 0.01855, 0.02085 },
-
-  { 0.68910, 0.67470, 0.66370, 0.66340, 0.65400, 0.64460, 0.64120, 0.61740, 0.61020, 0.59290, 0.58240, 0.56690, 0.57110,
-    0.55810, 0.54650, 0.53130, 0.52610, 0.51200, 0.49810, 0.48530, 0.48690, 0.48150, 0.47100, 0.44610, 0.43360, 0.43630,
-    0.41640, 0.41670, 0.40760, 0.39680, 0.38090, 0.38680, 0.37150, 0.36880, 0.36050, 0.34570, 0.33380, 0.32750, 0.32550,
-    0.31570, 0.31170, 0.30200, 0.28510, 0.28540, 0.28240, 0.26730, 0.26210, 0.26730, 0.25150, 0.24950, 0.24100, 0.23150,
-    0.22630, 0.21650, 0.22150, 0.21430, 0.20760, 0.19990, 0.18610, 0.18940, 0.19290, 0.18350, 0.17690, 0.16830, 0.17030,
-    0.16210, 0.15310, 0.14570, 0.14960, 0.14150, 0.13860, 0.13350, 0.12300, 0.12880, 0.12900, 0.12350, 0.11900, 0.11280,
-    0.11120, 0.10710, 0.10500, 0.10350, 0.10030, 0.09460, 0.08850, 0.09070, 0.09010, 0.08600, 0.08490, 0.08210, 0.07550,
-    0.07440, 0.07960, 0.07740, 0.07190, 0.07100, 0.06770, 0.06190, 0.06050, 0.06170, 0.06200, 0.05870, 0.05490, 0.05240,
-    0.05300, 0.05540, 0.05070, 0.05070, 0.04940, 0.04670, 0.04440, 0.04240, 0.04300, 0.04100, 0.04200 },
-
-  { 0.21424, 0.21948, 0.22320, 0.22330, 0.22628, 0.22909, 0.23006, 0.23622, 0.23786, 0.24137, 0.24321, 0.24552, 0.24494,
-    0.24662, 0.24784, 0.24902, 0.24932, 0.24986, 0.25000, 0.24978, 0.24983, 0.24966, 0.24916, 0.24710, 0.24559, 0.24594,
-    0.24301, 0.24306, 0.24146, 0.23935, 0.23581, 0.23719, 0.23349, 0.23279, 0.23054, 0.22619, 0.22238, 0.22024, 0.21955,
-    0.21603, 0.21454, 0.21080, 0.20382, 0.20395, 0.20265, 0.19585, 0.19340, 0.19585, 0.18825, 0.18725, 0.18292, 0.17791,
-    0.17509, 0.16963, 0.17244, 0.16838, 0.16450, 0.15994, 0.15147, 0.15353, 0.15569, 0.14983, 0.14561, 0.13997, 0.14130,
-    0.13582, 0.12966, 0.12447, 0.12722, 0.12148, 0.11939, 0.11568, 0.10787, 0.11221, 0.11236, 0.10825, 0.10484, 0.10008,
-    0.09884, 0.09563, 0.09398, 0.09279, 0.09024, 0.08565, 0.08067, 0.08247, 0.08198, 0.07860, 0.07769, 0.07536, 0.06980,
-    0.06886, 0.07326, 0.07141, 0.06673, 0.06596, 0.06312, 0.05807, 0.05684, 0.05789, 0.05816, 0.05525, 0.05189, 0.04965,
-    0.05019, 0.05233, 0.04813, 0.04813, 0.04696, 0.04452, 0.04060, 0.04243, 0.04115, 0.03932, 0.04024 },
-
-  { 0.68003, 0.66552, 0.65444, 0.65414, 0.64468, 0.63522, 0.63180, 0.60787, 0.60064, 0.58327, 0.57273, 0.55719, 0.56140,
-    0.54837, 0.53674, 0.52152, 0.51631, 0.50220, 0.48830, 0.47550, 0.47710, 0.47171, 0.46122, 0.43636, 0.42389, 0.42658,
-    0.40674, 0.40704, 0.39797, 0.38721, 0.37138, 0.37725, 0.36203, 0.35934, 0.35109, 0.33638, 0.32456, 0.31830, 0.31632,
-    0.30659, 0.30262, 0.29300, 0.27625, 0.27655, 0.27358, 0.25863, 0.25348, 0.25863, 0.24300, 0.24102, 0.23262, 0.22323,
-    0.21810, 0.20843, 0.21336, 0.20626, 0.19965, 0.19206, 0.17847, 0.18172, 0.18517, 0.17591, 0.16942, 0.16097, 0.16293,
-    0.15488, 0.14604, 0.13878, 0.14261, 0.13467, 0.13183, 0.12683, 0.11656, 0.12223, 0.12243, 0.11705, 0.11265, 0.10660,
-    0.10504, 0.10104, 0.09899, 0.09753, 0.09441, 0.08886, 0.08293, 0.08507, 0.08449, 0.08050, 0.07944, 0.07672, 0.07032,
-    0.06926, 0.07429, 0.07216, 0.06684, 0.06597, 0.06278, 0.05718, 0.05583, 0.05698, 0.05727, 0.05409, 0.05044, 0.04803,
-    0.04861, 0.05092, 0.04640, 0.04640, 0.04515, 0.04256, 0.03845, 0.04036, 0.03043, 0.02871, 0.02957 },
-
-  { 0.69817, 0.68388, 0.67296, 0.67266, 0.66332, 0.65398, 0.65060, 0.62693, 0.61976, 0.60253, 0.59207, 0.57661, 0.58080,
-    0.56783, 0.55626, 0.54108, 0.53589, 0.52180, 0.50790, 0.49510, 0.49670, 0.49129, 0.48078, 0.45584, 0.44331, 0.44602,
-    0.42606, 0.42636, 0.41723, 0.40639, 0.39042, 0.39635, 0.38097, 0.37826, 0.36991, 0.35502, 0.34304, 0.33670, 0.33468,
-    0.32481, 0.32078, 0.31100, 0.29395, 0.29425, 0.29122, 0.27597, 0.27072, 0.27597, 0.26000, 0.25798, 0.24938, 0.23977,
-    0.23450, 0.22457, 0.22964, 0.22234, 0.21555, 0.20774, 0.19373, 0.19708, 0.20063, 0.19109, 0.18438, 0.17563, 0.17767,
-    0.16932, 0.16016, 0.15262, 0.15659, 0.14833, 0.14537, 0.14017, 0.12944, 0.13537, 0.13557, 0.12995, 0.12535, 0.11900,
-    0.11736, 0.11316, 0.11101, 0.10947, 0.10619, 0.10034, 0.09407, 0.09633, 0.09571, 0.09150, 0.09036, 0.08748, 0.08068,
-    0.07954, 0.08490, 0.08264, 0.07696, 0.07603, 0.07262, 0.06662, 0.06517, 0.06642, 0.06673, 0.06331, 0.05937, 0.05677,
-    0.05739, 0.05988, 0.05500, 0.05500, 0.05365, 0.05084, 0.04635, 0.04844, 0.05557, 0.05329, 0.05443 },
+  {20,20.1,20.2,20.3,20.4,20.5,20.6,20.7,20.8,20.9,21,21.1,21.2,21.3,21.4,21.5,21.6,21.7,
+   21.8,21.9,22,22.1,22.2,22.3,22.4,22.5,22.6,22.7,22.8,22.9,23,23.1,23.2,23.3,23.4,23.5,
+   23.6,23.7,23.8,23.9,24,24.1,24.2,24.3,24.4,24.5,24.6,24.7,24.8,24.9,25,25.1,25.2,25.3,
+   25.4,25.5,25.6,25.7,25.8,25.9,26,26.1,26.2,26.3,26.4,26.5,26.6,26.7,26.8,26.9,27,27.1,
+   27.2,27.3,27.4,27.5,27.6,27.7,27.8,27.9,28,28.1,28.2,28.3,28.4,28.5,28.6,28.7,28.8,28.9,
+   29,29.1,29.2,29.3,29.4,29.5,29.6,29.7,29.8,29.9,30,30.1,30.2,30.3,30.4,30.5,30.6,30.7,
+   30.8,30.9,31,31.1,31.2,31.3,31.4,31.5,31.6,31.7,31.8,31.9,32,32.1,32.2,32.3,32.4,32.5,
+   32.6,32.7,32.8,32.9,33,33.1,33.2,33.3,33.4,33.5,33.6,33.7,33.8,33.9,34,34.1,34.2,34.3,
+   34.4,34.5,34.6,34.7,34.8,34.9,35,35.1,35.2,35.3,35.4,35.5,35.6,35.7,35.8,35.9,36,36.1,
+   36.2,36.3,36.4,36.5,36.6,36.7,36.8,36.9,37,37.1,37.2,37.3,37.4,37.5,37.6,37.7,37.8,37.9,
+   38,38.1,38.2,38.3,38.4,38.5,38.6,38.7,38.8,38.9,39,39.1,39.2,39.3,39.4,39.5,39.6,39.7,
+   39.8,39.9,40,40.1,40.2,40.3,40.4,40.5,40.6,40.7,40.8,40.9,41,41.1,41.2,41.3,41.4,41.5,
+   41.6,41.7,41.8,41.9,42,42.1,42.2,42.3,42.4,42.5,42.6,42.7,42.8,42.9,43,43.1,43.2,43.3,
+   43.4,43.5,43.6,43.7,43.8,43.9,44,44.1,44.2,44.3,44.4,44.5,44.6,44.7,44.8,44.9,45,45.1,
+   45.2,45.3,45.4,45.5,45.6,45.7,45.8,45.9,46,46.1,46.2,46.3,46.4,46.5,46.6,46.7,46.8,46.9,
+   47,47.1,47.2,47.3,47.4,47.5,47.6,47.7,47.8,47.9,48,48.1,48.2,48.3,48.4,48.5,48.6,48.7,
+   48.8,48.9,49,49.1,49.2,49.3,49.4,49.5,49.6,49.7,49.8,49.9,50,50.1,50.2,50.3,50.4,50.5,
+   50.6,50.7,50.8,50.9,51,51.1,51.2,51.3,51.4,51.5,51.6,51.7,51.8,51.9,52,52.1,52.2,52.3,
+   52.4,52.5,52.6,52.7,52.8,52.9,53},
+
+  {0.473383,0.465027,0.456673,0.448325,0.439984,0.431653,0.423335,0.415032,0.406746,0.398480,0.390237,
+  0.382020,0.373830,0.365672,0.357547,0.349458,0.341409,0.333402,0.325439,0.317525,0.309662,0.301852,
+  0.294099,0.286406,0.278776,0.271211,0.263714,0.256290,0.248939,0.241667,0.234474,0.227364,0.220341,
+  0.213406,0.206562,0.199813,0.193161,0.186608,0.180156,0.173809,0.167569,0.161438,0.155418,0.149511,
+  0.143719,0.138045,0.132489,0.127053,0.121740,0.116550,0.111485,0.106546,0.101733,0.097049,0.092492,
+  0.088064,0.083766,0.079597,0.075558,0.071648,0.067867,0.064215,0.060691,0.057295,0.054025,0.050880,
+  0.047860,0.044962,0.042185,0.039528,0.036989,0.034565,0.032255,0.030056,0.027965,0.025981,0.024101,
+  0.022322,0.020641,0.019055,0.017561,0.016157,0.014839,0.013604,0.012449,0.011371,0.010366,0.009431,
+  0.008563,0.007760,0.007017,0.006331,0.005700,0.005120,0.004589,0.004103,0.003660,0.003256,0.002890,
+  0.002558,0.002259,0.001989,0.001747,0.001529,0.001335,0.001162,0.001009,0.000873,0.000753,0.000647,
+  0.000555,0.000474,0.000403,0.000342,0.000289,0.000243,0.000204,0.000170,0.000142,0.000117,0.000097,
+  0.000080,0.000065,0.000053,0.000043,0.000035,0.000028,0.000022,0.000018,0.000014,0.000011,0.000009,
+  0.000007,0.000005,0.000004,0.000003,0.000002,0.000002,0.000001,0.000001,0.000001,0.000001,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000},
+
+  {0.899428,0.883551,0.867679,0.851817,0.835970,0.820141,0.804337,0.788561,0.772818,0.757113,0.741451,
+  0.725838,0.710278,0.694776,0.679339,0.663970,0.648677,0.633463,0.618335,0.603298,0.588357,0.573519,
+  0.558789,0.544172,0.529674,0.515300,0.501058,0.486950,0.472985,0.459166,0.445500,0.431992,0.418647,
+  0.405471,0.392468,0.379645,0.367005,0.354554,0.342297,0.330238,0.318382,0.306732,0.295294,0.284071,
+  0.273066,0.262285,0.251729,0.241402,0.231306,0.221446,0.211822,0.202437,0.193293,0.184392,0.175735,
+  0.167322,0.159155,0.151234,0.143559,0.136131,0.128947,0.122008,0.115313,0.108860,0.102647,0.096672,
+  0.090933,0.085428,0.080152,0.075104,0.070279,0.065674,0.061284,0.057106,0.053134,0.049364,0.045792,
+  0.042411,0.039217,0.036204,0.033367,0.030699,0.028194,0.025848,0.023653,0.021604,0.019695,0.017919,
+  0.016271,0.014743,0.013332,0.012029,0.010830,0.009728,0.008719,0.007796,0.006953,0.006187,0.005491,
+  0.004861,0.004292,0.003779,0.003318,0.002906,0.002537,0.002209,0.001917,0.001659,0.001430,0.001230,
+  0.001054,0.000900,0.000766,0.000649,0.000549,0.000462,0.000387,0.000324,0.000269,0.000223,0.000184,
+  0.000151,0.000124,0.000101,0.000082,0.000066,0.000053,0.000042,0.000034,0.000027,0.000021,0.000016,
+  0.000013,0.000010,0.000008,0.000006,0.000004,0.000003,0.000003,0.000002,0.000001,0.000001,0.000001,
+  0.000001,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000},
+
+  {0.163210,0.176020,0.187600,0.194680,0.203900,0.213060,0.224650,0.229210,0.234400,0.242200,0.245430,
+  0.248200,0.249480,0.249980,0.249410,0.247290,0.245040,0.242130,0.237250,0.230790,0.224780,0.217600,
+  0.209440,0.198020,0.192010,0.188000,0.177640,0.167520,0.158250,0.152220,0.143330,0.129380,0.125460,
+  0.114500,0.113030,0.100460,0.097670,0.091910,0.085250,0.079510,0.073260,0.063030,0.063890,0.054640,
+  0.053480,0.046690,0.046600,0.041060,0.035260,0.029190,0.029290,0.026180,0.023140,0.022570,0.022380,
+  0.018160,0.018540,0.013030,0.014970,0.012340,0.012250,0.009800,0.009900,0.007340,0.009020,0.009610,
+  0.004680,0.005960,0.005170,0.005370,0.003690,0.003880,0.003690,0.002490,0.003190,0.003090,0.003090,
+  0.001900,0.001900,0.001300,0.001300,0.001200,0.001400,0.000700,0.000700,0.001100,0.000800,0.000200,
+  0.000500,0.001000,0.000600,0.000700,0.000300,0.000700,0.000600,0.000700,0.000100,0.000400,0.000400,
+  0.000300,0.000200,0.000200,0.000200,0.000200,0.000200,0.000400,0.000000,0.000100,0.000000,0.000100,
+  0.000200,0.000400,0.000200,0.000100,0.000100,0.000400,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000},
+
+  {0.890434,0.874715,0.859002,0.843299,0.827610,0.811940,0.796293,0.780675,0.765089,0.749542,0.734037,
+  0.718579,0.703175,0.687828,0.672545,0.657331,0.642190,0.627128,0.612151,0.597265,0.582474,0.567784,
+  0.553201,0.538730,0.524377,0.510147,0.496047,0.482081,0.468255,0.454575,0.441045,0.427672,0.414461,
+  0.401416,0.388544,0.375848,0.363335,0.351009,0.338874,0.326936,0.315198,0.303665,0.292341,0.281230,
+  0.270336,0.259662,0.249211,0.238988,0.228993,0.219231,0.209704,0.200413,0.191361,0.182548,0.173977,
+  0.165649,0.157564,0.149722,0.142124,0.134769,0.127658,0.120788,0.114160,0.107771,0.101620,0.095705,
+  0.090024,0.084573,0.079351,0.074353,0.069576,0.065017,0.060671,0.056535,0.052603,0.048871,0.045334,
+  0.041987,0.038825,0.035842,0.033033,0.030392,0.027912,0.025589,0.023417,0.021388,0.019498,0.017740,
+  0.016108,0.014596,0.013198,0.011909,0.010722,0.009631,0.008632,0.007718,0.006884,0.006125,0.005436,
+  0.004812,0.004249,0.003741,0.003285,0.002877,0.002512,0.002187,0.001898,0.001642,0.001416,0.001218,
+  0.001043,0.000891,0.000758,0.000643,0.000543,0.000457,0.000384,0.000320,0.000267,0.000221,0.000182,
+  0.000150,0.000123,0.000100,0.000081,0.000065,0.000052,0.000042,0.000033,0.000026,0.000021,0.000016,
+  0.000013,0.000010,0.000008,0.000006,0.000004,0.000003,0.000003,0.000002,0.000001,0.000001,0.000001,
+  0.000001,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000},
+
+  {0.908423,0.892386,0.876356,0.860335,0.844330,0.828343,0.812380,0.796446,0.780546,0.764684,0.748866,
+  0.733096,0.717380,0.701724,0.686132,0.670610,0.655163,0.639798,0.624518,0.609331,0.594241,0.579254,
+  0.564377,0.549613,0.534970,0.520453,0.506068,0.491820,0.477715,0.463758,0.449955,0.436312,0.422834,
+  0.409526,0.396393,0.383441,0.370675,0.358100,0.345720,0.333540,0.321565,0.309799,0.298247,0.286911,
+  0.275797,0.264907,0.254246,0.243816,0.233619,0.223660,0.213940,0.204462,0.195226,0.186236,0.177492,
+  0.168995,0.160747,0.152747,0.144995,0.137492,0.130237,0.123228,0.116466,0.109948,0.103673,0.097639,
+  0.091843,0.086282,0.080954,0.075855,0.070982,0.066330,0.061897,0.057677,0.053665,0.049858,0.046250,
+  0.042835,0.039609,0.036566,0.033700,0.031006,0.028476,0.026106,0.023890,0.021820,0.019892,0.018098,
+  0.016433,0.014891,0.013465,0.012149,0.010938,0.009826,0.008806,0.007873,0.007023,0.006249,0.005546,
+  0.004910,0.004335,0.003817,0.003352,0.002935,0.002562,0.002231,0.001936,0.001675,0.001445,0.001242,
+  0.001064,0.000909,0.000774,0.000656,0.000554,0.000467,0.000391,0.000327,0.000272,0.000225,0.000186,
+  0.000153,0.000125,0.000102,0.000083,0.000067,0.000054,0.000043,0.000034,0.000027,0.000021,0.000017,
+  0.000013,0.000010,0.000008,0.000006,0.000004,0.000003,0.000003,0.000002,0.000001,0.000001,0.000001,
+  0.000001,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,
+  0.000000}
 };
 
 static const double modulation5[6][547] = {
diff -Naur ns-3.22/src/wimax/model/dl-mac-messages.cc ns-3.23/src/wimax/model/dl-mac-messages.cc
--- ns-3.22/src/wimax/model/dl-mac-messages.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/dl-mac-messages.cc	2015-05-13 11:05:27.000000000 -0700
@@ -384,6 +384,7 @@
 {
   static TypeId tid = TypeId ("ns3::Dcd")
     .SetParent<Header> ()
+    .SetGroupName("Wimax")
     .AddConstructor<Dcd> ()
   ;
   return tid;
@@ -603,6 +604,7 @@
 {
   static TypeId tid = TypeId ("ns3::DlMap")
     .SetParent<Header> ()
+    .SetGroupName("Wimax")
     .AddConstructor<DlMap> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wimax/model/ipcs-classifier.cc ns-3.23/src/wimax/model/ipcs-classifier.cc
--- ns-3.22/src/wimax/model/ipcs-classifier.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/ipcs-classifier.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,7 +40,8 @@
 TypeId IpcsClassifier::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::IpcsClassifier")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/mac-messages.cc ns-3.23/src/wimax/model/mac-messages.cc
--- ns-3.22/src/wimax/model/mac-messages.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/mac-messages.cc	2015-05-13 11:05:27.000000000 -0700
@@ -68,7 +68,7 @@
 ManagementMessageType::GetTypeId (void)
 {
   static TypeId tid =
-    TypeId ("ns3::ManagementMessageType").SetParent<Header> ().AddConstructor<ManagementMessageType> ();
+    TypeId ("ns3::ManagementMessageType").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<ManagementMessageType> ();
   return tid;
 }
 
@@ -166,7 +166,7 @@
 TypeId
 RngReq::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::RngReq").SetParent<Header> ().AddConstructor<RngReq> ();
+  static TypeId tid = TypeId ("ns3::RngReq").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<RngReq> ();
   return tid;
 }
 
@@ -423,7 +423,7 @@
 TypeId
 RngRsp::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::RngRsp").SetParent<Header> ().AddConstructor<RngRsp> ();
+  static TypeId tid = TypeId ("ns3::RngRsp").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<RngRsp> ();
   return tid;
 }
 
@@ -564,7 +564,7 @@
 TypeId
 DsaReq::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::DsaReq").SetParent<Header> ().AddConstructor<DsaReq> ();
+  static TypeId tid = TypeId ("ns3::DsaReq").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<DsaReq> ();
   return tid;
 }
 
@@ -705,7 +705,7 @@
 TypeId
 DsaRsp::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::DsaRsp").SetParent<Header> ().AddConstructor<DsaRsp> ();
+  static TypeId tid = TypeId ("ns3::DsaRsp").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<DsaRsp> ();
   return tid;
 }
 
@@ -799,7 +799,7 @@
 TypeId
 DsaAck::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::DsaAck").SetParent<Header> ().AddConstructor<DsaAck> ();
+  static TypeId tid = TypeId ("ns3::DsaAck").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<DsaAck> ();
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/service-flow-manager.cc ns-3.23/src/wimax/model/service-flow-manager.cc
--- ns-3.22/src/wimax/model/service-flow-manager.cc	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/src/wimax/model/service-flow-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -49,7 +49,8 @@
 TypeId ServiceFlowManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::ServiceFlowManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/ss-link-manager.cc ns-3.23/src/wimax/model/ss-link-manager.cc
--- ns-3.22/src/wimax/model/ss-link-manager.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/ss-link-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,7 +40,8 @@
 TypeId SSLinkManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::SSLinkManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/ss-manager.cc ns-3.23/src/wimax/model/ss-manager.cc
--- ns-3.22/src/wimax/model/ss-manager.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/ss-manager.cc	2015-05-13 11:05:27.000000000 -0700
@@ -34,7 +34,8 @@
 TypeId SSManager::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::SSManager")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/ss-scheduler.cc ns-3.23/src/wimax/model/ss-scheduler.cc
--- ns-3.22/src/wimax/model/ss-scheduler.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/ss-scheduler.cc	2015-05-13 11:05:27.000000000 -0700
@@ -40,7 +40,8 @@
 TypeId SSScheduler::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::SSScheduler")
-    .SetParent<Object> ();
+    .SetParent<Object> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/ul-mac-messages.cc ns-3.23/src/wimax/model/ul-mac-messages.cc
--- ns-3.22/src/wimax/model/ul-mac-messages.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/ul-mac-messages.cc	2015-05-13 11:05:27.000000000 -0700
@@ -376,6 +376,7 @@
 {
   static TypeId tid = TypeId ("ns3::Ucd")
     .SetParent<Header> ()
+    .SetGroupName("Wimax")
     .AddConstructor<Ucd> ()
   ;
   return tid;
@@ -637,6 +638,7 @@
 {
   static TypeId tid = TypeId ("ns3::UlMap")
     .SetParent<Header> ()
+    .SetGroupName("Wimax")
     .AddConstructor<UlMap> ()
   ;
   return tid;
diff -Naur ns-3.22/src/wimax/model/wimax-channel.cc ns-3.23/src/wimax/model/wimax-channel.cc
--- ns-3.22/src/wimax/model/wimax-channel.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/wimax-channel.cc	2015-05-13 11:05:27.000000000 -0700
@@ -32,7 +32,8 @@
 TypeId WimaxChannel::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::WimaxChannel")
-    .SetParent<Channel> ();
+    .SetParent<Channel> ()
+    .SetGroupName("Wimax");
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/wimax-connection.cc ns-3.23/src/wimax/model/wimax-connection.cc
--- ns-3.22/src/wimax/model/wimax-connection.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/wimax-connection.cc	2015-05-13 11:05:27.000000000 -0700
@@ -35,6 +35,8 @@
 
     .SetParent<Object> ()
 
+    .SetGroupName("Wimax")
+
     .AddAttribute ("Type",
                    "Connection type",
                    EnumValue (Cid::INITIAL_RANGING),
diff -Naur ns-3.22/src/wimax/model/wimax-mac-header.cc ns-3.23/src/wimax/model/wimax-mac-header.cc
--- ns-3.22/src/wimax/model/wimax-mac-header.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/wimax-mac-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -62,7 +62,7 @@
 TypeId
 MacHeaderType::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::MacHeaderType").SetParent<Header> ().AddConstructor<MacHeaderType> ();
+  static TypeId tid = TypeId ("ns3::MacHeaderType").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<MacHeaderType> ();
   return tid;
 }
 
@@ -200,7 +200,7 @@
 
 TypeId GenericMacHeader::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::GenericMacHeader").SetParent<Header> ().AddConstructor<GenericMacHeader> ();
+  static TypeId tid = TypeId ("ns3::GenericMacHeader").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<GenericMacHeader> ();
   return tid;
 }
 
@@ -379,7 +379,7 @@
 
 TypeId BandwidthRequestHeader::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::BandwidthRequestHeader").SetParent<Header> ().AddConstructor<
+  static TypeId tid = TypeId ("ns3::BandwidthRequestHeader").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<
       BandwidthRequestHeader> ();
   return tid;
 }
@@ -528,7 +528,7 @@
 
 TypeId GrantManagementSubheader::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::GrantManagementSubheader").SetParent<Header> ().AddConstructor<
+  static TypeId tid = TypeId ("ns3::GrantManagementSubheader").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<
       GrantManagementSubheader> ();
   return tid;
 }
@@ -616,7 +616,7 @@
 FragmentationSubheader::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::FragmentationSubheader").SetParent<
-      Header> ().AddConstructor<FragmentationSubheader> ();
+      Header> ().SetGroupName("Wimax").AddConstructor<FragmentationSubheader> ();
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/wimax-mac-queue.cc ns-3.23/src/wimax/model/wimax-mac-queue.cc
--- ns-3.22/src/wimax/model/wimax-mac-queue.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/wimax-mac-queue.cc	2015-05-13 11:05:27.000000000 -0700
@@ -79,6 +79,7 @@
 {
   static TypeId tid = TypeId ("ns3::WimaxMacQueue")
     .SetParent<Object> ()
+    .SetGroupName("Wimax")
     .AddAttribute (
       "MaxSize",
       "Maximum size",
diff -Naur ns-3.22/src/wimax/model/wimax-mac-to-mac-header.cc ns-3.23/src/wimax/model/wimax-mac-to-mac-header.cc
--- ns-3.22/src/wimax/model/wimax-mac-to-mac-header.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/wimax-mac-to-mac-header.cc	2015-05-13 11:05:27.000000000 -0700
@@ -46,7 +46,7 @@
 WimaxMacToMacHeader::GetTypeId (void)
 {
   static TypeId tid =
-    TypeId ("ns3::WimaxMacToMacHeader").SetParent<Header> ().AddConstructor<WimaxMacToMacHeader> ();
+    TypeId ("ns3::WimaxMacToMacHeader").SetParent<Header> ().SetGroupName("Wimax").AddConstructor<WimaxMacToMacHeader> ();
   return tid;
 }
 
diff -Naur ns-3.22/src/wimax/model/wimax-phy.cc ns-3.23/src/wimax/model/wimax-phy.cc
--- ns-3.22/src/wimax/model/wimax-phy.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/model/wimax-phy.cc	2015-05-13 11:05:27.000000000 -0700
@@ -38,7 +38,7 @@
 
 TypeId WimaxPhy::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("ns3::WimaxPhy").SetParent<Object> ()
+  static TypeId tid = TypeId ("ns3::WimaxPhy").SetParent<Object> ().SetGroupName("Wimax")
 
     .AddAttribute ("Channel",
                    "Wimax channel",
diff -Naur ns-3.22/src/wimax/test/mac-messages-test.cc ns-3.23/src/wimax/test/mac-messages-test.cc
--- ns-3.22/src/wimax/test/mac-messages-test.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/test/mac-messages-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -18,26 +18,9 @@
  *         Mohamed Amine Ismail <amine.ismail@sophia.inria.fr>
  *
  */
-#include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
-#include "ns3/simulator.h"
-#include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/wimax-tlv.h"
-#include "ns3/ipcs-classifier-record.h"
 #include "ns3/service-flow.h"
-#include <iostream>
+#include "ns3/mac-messages.h"
 
 using namespace ns3;
 /*
diff -Naur ns-3.22/src/wimax/test/phy-test.cc ns-3.23/src/wimax/test/phy-test.cc
--- ns-3.22/src/wimax/test/phy-test.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/test/phy-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -19,23 +19,12 @@
  *                              <amine.ismail@udcast.com>
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/config.h"
-#include "ns3/string.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
 #include "ns3/simulator.h"
+#include "ns3/node-container.h"
+#include "ns3/net-device-container.h"
 #include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
 #include "ns3/snr-to-block-error-rate-manager.h"
-#include <iostream>
 
 using namespace ns3;
 
diff -Naur ns-3.22/src/wimax/test/qos-test.cc ns-3.23/src/wimax/test/qos-test.cc
--- ns-3.22/src/wimax/test/qos-test.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/test/qos-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -19,22 +19,17 @@
  *                              <amine.ismail@udcast.com>
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/config.h"
-#include "ns3/string.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
 #include "ns3/simulator.h"
+#include "ns3/node-container.h"
 #include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include <iostream>
-#include "ns3/global-route-manager.h"
+#include "ns3/net-device-container.h"
+#include "ns3/internet-stack-helper.h"
+#include "ns3/ipv4-address-helper.h"
+#include "ns3/ipv4-interface-container.h"
+#include "ns3/ipv4-address.h"
+#include "ns3/service-flow.h"
+#include "ns3/ipcs-classifier-record.h"
 
 using namespace ns3;
 
diff -Naur ns-3.22/src/wimax/test/ss-mac-test.cc ns-3.23/src/wimax/test/ss-mac-test.cc
--- ns-3.22/src/wimax/test/ss-mac-test.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/test/ss-mac-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -19,24 +19,11 @@
  *                              <amine.ismail@udcast.com>
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/config.h"
-#include "ns3/string.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
 #include "ns3/simulator.h"
 #include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include <iostream>
-#include "ns3/global-route-manager.h"
+#include "ns3/net-device-container.h"
+#include "ns3/node-container.h"
 
 using namespace ns3;
 
diff -Naur ns-3.22/src/wimax/test/wimax-fragmentation-test.cc ns-3.23/src/wimax/test/wimax-fragmentation-test.cc
--- ns-3.22/src/wimax/test/wimax-fragmentation-test.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/test/wimax-fragmentation-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -19,26 +19,14 @@
  *                       <peppe.piro@gmail.com>
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
+#include "ns3/ptr.h"
+#include "ns3/packet.h"
 #include "ns3/simulator.h"
-#include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/wimax-tlv.h"
-#include "ns3/ipcs-classifier-record.h"
-#include "ns3/service-flow.h"
+#include "ns3/wimax-mac-header.h"
+#include "ns3/mac-messages.h"
+#include "ns3/cid.h"
 #include "ns3/wimax-connection.h"
-#include <iostream>
 
 using namespace ns3;
 
diff -Naur ns-3.22/src/wimax/test/wimax-service-flow-test.cc ns-3.23/src/wimax/test/wimax-service-flow-test.cc
--- ns-3.22/src/wimax/test/wimax-service-flow-test.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/test/wimax-service-flow-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -19,26 +19,16 @@
  *                              <amine.ismail@udcast.com>
  *
  */
-#include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
 #include "ns3/internet-stack-helper.h"
 #include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
+#include "ns3/ipv4-interface-container.h"
+#include "ns3/ipv4-address.h"
 #include "ns3/simulator.h"
 #include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
-#include "ns3/wimax-tlv.h"
+#include "ns3/cs-parameters.h"
 #include "ns3/ipcs-classifier-record.h"
 #include "ns3/service-flow.h"
-#include <iostream>
 
 using namespace ns3;
 
diff -Naur ns-3.22/src/wimax/test/wimax-tlv-test.cc ns-3.23/src/wimax/test/wimax-tlv-test.cc
--- ns-3.22/src/wimax/test/wimax-tlv-test.cc	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/test/wimax-tlv-test.cc	2015-05-13 11:05:27.000000000 -0700
@@ -20,25 +20,14 @@
  *
  */
 #include "ns3/log.h"
-#include "ns3/abort.h"
 #include "ns3/test.h"
-#include "ns3/uinteger.h"
-#include "ns3/inet-socket-address.h"
-#include "ns3/point-to-point-helper.h"
-#include "ns3/internet-stack-helper.h"
-#include "ns3/ipv4-address-helper.h"
-#include "ns3/ipv4-header.h"
-#include "ns3/packet-sink-helper.h"
-#include "ns3/udp-client-server-helper.h"
-#include "ns3/udp-header.h"
-#include "ns3/simulator.h"
+#include "ns3/ipcs-classifier-record.h"
+#include "ns3/ptr.h"
+#include "ns3/packet.h"
 #include "ns3/wimax-helper.h"
-#include "ns3/mobility-helper.h"
-#include "ns3/global-route-manager.h"
 #include "ns3/wimax-tlv.h"
-#include "ns3/ipcs-classifier-record.h"
 #include "ns3/service-flow.h"
-#include <iostream>
+#include "ns3/cs-parameters.h"
 
 using namespace ns3;
 
diff -Naur ns-3.22/src/wimax/wscript ns-3.23/src/wimax/wscript
--- ns-3.22/src/wimax/wscript	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wimax/wscript	2015-05-13 11:05:27.000000000 -0700
@@ -1,6 +1,6 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 def build(bld):
-    obj = bld.create_ns3_module('wimax', ['network', 'point-to-point', 'internet', 'propagation', 'mobility'])
+    obj = bld.create_ns3_module('wimax', ['network', 'internet', 'propagation', 'mobility'])
     obj.source = [
             'model/cid.cc',
             'model/cid-factory.cc',
diff -Naur ns-3.22/src/wscript ns-3.23/src/wscript
--- ns-3.22/src/wscript	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/src/wscript	2015-05-13 11:05:27.000000000 -0700
@@ -1,3 +1,4 @@
+
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 import os, os.path
@@ -206,7 +207,11 @@
         return
 
     env.append_value('PYTHON_MODULES_BUILT', module)
-    apidefs = env['PYTHON_BINDINGS_APIDEFS'].replace("-", "_")
+    try:
+        apidefs = env['PYTHON_BINDINGS_APIDEFS'].replace("-", "_")
+    except AttributeError:
+        # we likely got an empty list for env['PYTHON_BINDINGS_APIDEFS']
+        return
 
     #debug = ('PYBINDGEN_DEBUG' in os.environ)
     debug = True # XXX
@@ -487,7 +492,7 @@
             up = m.update
             up(self.__class__.__name__.encode())
             for x in self.inputs + self.outputs:
-                up(x.abspath().encode())
+                up(x.abspath())
             up(self.mode)
             if self.mode == 'remove':
                 up(self.header_to_remove.abspath().encode())
@@ -579,7 +584,7 @@
             up = m.update
             up(self.__class__.__name__.encode())
             for x in self.inputs + self.outputs:
-                up(x.abspath().encode())
+                up(x.abspath())
             up(self.mode)
             if self.mode == 'remove':
                 up(self.header_to_remove.abspath().encode())
diff -Naur ns-3.22/VERSION ns-3.23/VERSION
--- ns-3.22/VERSION	2015-02-05 15:46:22.000000000 -0800
+++ ns-3.23/VERSION	2015-05-13 11:05:26.000000000 -0700
@@ -1 +1 @@
-3.22
+3.23
diff -Naur ns-3.22/waf-tools/boost.py ns-3.23/waf-tools/boost.py
--- ns-3.22/waf-tools/boost.py	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/waf-tools/boost.py	2015-05-13 11:05:27.000000000 -0700
@@ -1,375 +1,380 @@
-#!/usr/bin/env python
-# encoding: utf-8
-#
-# partially based on boost.py written by Gernot Vormayr
-# written by Ruediger Sonderfeld <ruediger@c-plusplus.de>, 2008
-# modified by Bjoern Michaelsen, 2008
-# modified by Luca Fossati, 2008
-# rewritten for waf 1.5.1, Thomas Nagy, 2008
-# rewritten for waf 1.6.2, Sylvain Rouquette, 2011
-
-'''
-
-This is an extra tool, not bundled with the default waf binary.
-To add the boost tool to the waf file:
-$ ./waf-light --tools=compat15,boost
-	or, if you have waf >= 1.6.2
-$ ./waf update --files=boost
-
-When using this tool, the wscript will look like:
-
-	def options(opt):
-		opt.load('compiler_cxx boost')
-
-	def configure(conf):
-		conf.load('compiler_cxx boost')
-		conf.check_boost(lib='system filesystem')
-
-	def build(bld):
-		bld(source='main.cpp', target='app', use='BOOST')
-
-Options are generated, in order to specify the location of boost includes/libraries.
-The `check_boost` configuration function allows to specify the used boost libraries.
-It can also provide default arguments to the --boost-static and --boost-mt command-line arguments.
-Everything will be packaged together in a BOOST component that you can use.
-
-When using MSVC, a lot of compilation flags need to match your BOOST build configuration:
- - you may have to add /EHsc to your CXXFLAGS or define boost::throw_exception if BOOST_NO_EXCEPTIONS is defined.
-   Errors: C4530
- - boost libraries will try to be smart and use the (pretty but often not useful) auto-linking feature of MSVC
-   So before calling `conf.check_boost` you might want to disabling by adding:
-   	conf.env.DEFINES_BOOST += ['BOOST_ALL_NO_LIB']
-   Errors: 
- - boost might also be compiled with /MT, which links the runtime statically.
-   If you have problems with redefined symbols, 
-		self.env['DEFINES_%s' % var] += ['BOOST_ALL_NO_LIB']
-		self.env['CXXFLAGS_%s' % var] += ['/MD', '/EHsc']
-Passing `--boost-linkage_autodetect` might help ensuring having a correct linkage in some basic cases.
-
-'''
-
-import sys
-import re
-from waflib import Utils, Logs, Errors
-from waflib.Configure import conf
-from waflib.Errors import WafError
-
-BOOST_LIBS = ['/usr/lib/x86_64-linux-gnu', '/usr/lib/i386-linux-gnu',
-              '/usr/lib', '/usr/local/lib', '/opt/local/lib', '/sw/lib', '/lib']
-BOOST_INCLUDES = ['/usr/include', '/usr/local/include', '/opt/local/include', '/sw/include']
-BOOST_VERSION_FILE = 'boost/version.hpp'
-BOOST_VERSION_CODE = '''
-#include <iostream>
-#include <boost/version.hpp>
-int main() { std::cout << BOOST_LIB_VERSION << std::endl; }
-'''
-
-# toolsets from {boost_dir}/tools/build/v2/tools/common.jam
-PLATFORM = Utils.unversioned_sys_platform()
-detect_intel = lambda env: (PLATFORM == 'win32') and 'iw' or 'il'
-detect_clang = lambda env: (PLATFORM == 'darwin') and 'clang-darwin' or 'clang'
-detect_mingw = lambda env: (re.search('MinGW', env.CXX[0])) and 'mgw' or 'gcc'
-BOOST_TOOLSETS = {
-	'borland':  'bcb',
-	'clang':	detect_clang,
-	'como':	 'como',
-	'cw':	   'cw',
-	'darwin':   'xgcc',
-	'edg':	  'edg',
-	'g++':	  detect_mingw,
-	'gcc':	  detect_mingw,
-	'icpc':	 detect_intel,
-	'intel':	detect_intel,
-	'kcc':	  'kcc',
-	'kylix':	'bck',
-	'mipspro':  'mp',
-	'mingw':	'mgw',
-	'msvc':	 'vc',
-	'qcc':	  'qcc',
-	'sun':	  'sw',
-	'sunc++':   'sw',
-	'tru64cxx': 'tru',
-	'vacpp':	'xlc'
-}
-
-
-def options(opt):
-	opt.add_option('--boost-includes', type='string',
-				   default='', dest='boost_includes',
-				   help='''path to the boost includes root (~boost root)
-				   e.g. /path/to/boost_1_47_0''')
-	opt.add_option('--boost-libs', type='string',
-				   default='', dest='boost_libs',
-				   help='''path to the directory where the boost libs are
-				   e.g. /path/to/boost_1_47_0/stage/lib''')
-	opt.add_option('--boost-static', action='store_true',
-				   default=False, dest='boost_static',
-				   help='link with static boost libraries (.lib/.a)')
-	opt.add_option('--boost-mt', action='store_true',
-				   default=False, dest='boost_mt',
-				   help='select multi-threaded libraries')
-	opt.add_option('--boost-abi', type='string', default='', dest='boost_abi',
-				   help='''select libraries with tags (dgsyp, d for debug),
-				   see doc Boost, Getting Started, chapter 6.1''')
-	opt.add_option('--boost-linkage_autodetect', action="store_true", dest='boost_linkage_autodetect',
-				   help="auto-detect boost linkage options (don't get used to it / might break other stuff)")
-	opt.add_option('--boost-toolset', type='string',
-				   default='', dest='boost_toolset',
-				   help='force a toolset e.g. msvc, vc90, \
-						gcc, mingw, mgw45 (default: auto)')
-	py_version = '%d%d' % (sys.version_info[0], sys.version_info[1])
-	opt.add_option('--boost-python', type='string',
-				   default=py_version, dest='boost_python',
-				   help='select the lib python with this version \
-						(default: %s)' % py_version)
-
-
-@conf
-def __boost_get_version_file(self, dir):
-	try:
-		return self.root.find_dir(dir).find_node(BOOST_VERSION_FILE)
-	except:
-		return None
-
-
-@conf
-def boost_get_version(self, dir):
-	"""silently retrieve the boost version number"""
-	re_but = re.compile('^#define\\s+BOOST_LIB_VERSION\\s+"(.*)"$', re.M)
-	try:
-		val = re_but.search(self.__boost_get_version_file(dir).read()).group(1)
-	except:
-		val = self.check_cxx(fragment=BOOST_VERSION_CODE, includes=[dir], execute=False, define_ret=True)
-	return val
-
-
-@conf
-def boost_get_includes(self, *k, **kw):
-	includes = k and k[0] or kw.get('includes', None)
-	if includes and self.__boost_get_version_file(includes):
-		return includes
-	for dir in BOOST_INCLUDES:
-		if self.__boost_get_version_file(dir):
-			return dir
-	if kw.get('boost_mandatory', True):
-		if includes:
-			self.fatal('headers not found in %s' % includes)
-		else:
-			self.fatal('headers not found, please provide a --boost-includes argument (see help)')
-
-
-@conf
-def boost_get_toolset(self, cc):
-	toolset = cc
-	if not cc:
-		build_platform = Utils.unversioned_sys_platform()
-		if build_platform in BOOST_TOOLSETS:
-			cc = build_platform
-		else:
-			cc = self.env.CXX_NAME
-	if cc in BOOST_TOOLSETS:
-		toolset = BOOST_TOOLSETS[cc]
-	return isinstance(toolset, str) and toolset or toolset(self.env)
-
-
-@conf
-def __boost_get_libs_path(self, *k, **kw):
-	''' return the lib path and all the files in it '''
-	if 'files' in kw:
-		return self.root.find_dir('.'), Utils.to_list(kw['files'])
-	libs = k and k[0] or kw.get('libs', None)
-	if libs:
-		path = self.root.find_dir(libs)
-		files = path.ant_glob('*boost_*')
-	if not libs or not files:
-		for dir in BOOST_LIBS:
-			try:
-				path = self.root.find_dir(dir)
-				files = path.ant_glob('*boost_*')
-				if files:
-					break
-				path = self.root.find_dir(dir + '64')
-				files = path.ant_glob('*boost_*')
-				if files:
-					break
-			except:
-				path = None
-	if not path:
-		if libs:
-			self.fatal('libs not found in %s' % libs)
-		else:
-			self.fatal('libs not found, please provide a --boost-libs argument (see help)')
-
-	self.to_log('Found the boost path in %r with the libraries:' % path)
-	for x in files:
-		self.to_log('    %r' % x)
-	return path, files
-
-@conf
-def boost_get_libs(self, *k, **kw):
-	'''
-	return the lib path and the required libs
-	according to the parameters
-	'''
-	path, files = self.__boost_get_libs_path(**kw)
-	t = []
-	if kw.get('mt', False):
-		t.append('mt')
-	if kw.get('abi', None):
-		t.append(kw['abi'])
-	tags = t and '(-%s)+' % '-'.join(t) or ''
-	toolset = self.boost_get_toolset(kw.get('toolset', ''))
-	toolset_pat = '(-%s[0-9]{0,3})+' % toolset
-	version = '(-%s)+' % self.env.BOOST_VERSION
-
-	def find_lib(re_lib, files):
-		for file in files:
-			if re_lib.search(file.name):
-				self.to_log('Found boost lib %s' % file)
-				return file
-		return None
-
-	def format_lib_name(name):
-		if name.startswith('lib') and self.env.CC_NAME != 'msvc':
-			name = name[3:]
-		return name[:name.rfind('.')]
-
-	libs = []
-	for lib in Utils.to_list(k and k[0] or kw.get('lib', None)):
-		py = (lib == 'python') and '(-py%s)+' % kw['python'] or ''
-		# Trying libraries, from most strict match to least one
-		for pattern in ['boost_%s%s%s%s%s' % (lib, toolset_pat, tags, py, version),
-						'boost_%s%s%s%s' % (lib, tags, py, version),
-						'boost_%s%s%s' % (lib, tags, version),
-						# Give up trying to find the right version
-						'boost_%s%s%s%s' % (lib, toolset_pat, tags, py),
-						'boost_%s%s%s' % (lib, tags, py),
-						'boost_%s%s' % (lib, tags)]:
-			self.to_log('Trying pattern %s' % pattern)
-			file = find_lib(re.compile(pattern), files)
-			if file:
-				libs.append(format_lib_name(file.name))
-				break
-		else:
-			self.fatal('lib %s not found in %s' % (lib, path.abspath()))
-
-	return path.abspath(), libs
-
-
-@conf
-def check_boost(self, *k, **kw):
-	"""
-	Initialize boost libraries to be used.
-
-	Keywords: you can pass the same parameters as with the command line (without "--boost-").
-	Note that the command line has the priority, and should preferably be used.
-	"""
-	if not self.env['CXX']:
-		self.fatal('load a c++ compiler first, conf.load("compiler_cxx")')
-
-	params = {'lib': k and k[0] or kw.get('lib', None)}
-	for key, value in self.options.__dict__.items():
-		if not key.startswith('boost_'):
-			continue
-		key = key[len('boost_'):]
-		params[key] = value and value or kw.get(key, '')
-
-	var = kw.get('uselib_store', 'BOOST')
-
-	self.start_msg('Checking boost includes')
-	try:
-		self.env['INCLUDES_%s' % var] = self.boost_get_includes(**params)
-		self.env.BOOST_VERSION = self.boost_get_version(self.env['INCLUDES_%s' % var])
-	except WafError:
-		self.end_msg("not found", 'YELLOW')
-		raise
-	#self.env['INCLUDES_%s' % var] = inc = self.boost_get_includes(**params)
-	#self.env.BOOST_VERSION = self.boost_get_version(inc)
-	self.end_msg(self.env.BOOST_VERSION)
-	if Logs.verbose:
-		Logs.pprint('CYAN', '	path : %s' % self.env['INCLUDES_%s' % var])
-
-	if not params['lib']:
-		return
-	self.start_msg('Checking boost libs')
-	try:
-		suffix = params.get('static', 'ST') or ''
-		path, libs = self.boost_get_libs(**params)
-	except WafError:
-		self.end_msg("not found", 'YELLOW')
-		raise
-	#suffix = params.get('static', None) and 'ST' or ''
-	#path, libs = self.boost_get_libs(**params)
-	self.env['%sLIBPATH_%s' % (suffix, var)] = [path]
-	self.env['%sLIB_%s' % (suffix, var)] = libs
-	self.end_msg('ok')
-	if Logs.verbose:
-		Logs.pprint('CYAN', '	path : %s' % path)
-		Logs.pprint('CYAN', '	libs : %s' % libs)
-
-
-	def try_link():
-		if 'system' in params['lib']:
-			self.check_cxx(
-			 fragment="\n".join([
-			  '#include <boost/system/error_code.hpp>',
-			  'int main() { boost::system::error_code c; }',
-			 ]),
-			 use=var,
-			 execute=False,
-			)
-		if 'thread' in params['lib']:
-			self.check_cxx(
-			 fragment="\n".join([
-			  '#include <boost/thread.hpp>',
-			  'int main() { boost::thread t; }',
-			 ]),
-			 use=var,
-			 execute=False,
-			)
-
-	if params.get('linkage_autodetect', False):
-		self.start_msg("Attempting to detect boost linkage flags")
-		toolset = self.boost_get_toolset(kw.get('toolset', ''))
-		if toolset in ['vc']:
-			# disable auto-linking feature, causing error LNK1181
-			# because the code wants to be linked against
-			self.env['DEFINES_%s' % var] += ['BOOST_ALL_NO_LIB']
-
-			# if no dlls are present, we guess the .lib files are not stubs
-			has_dlls = False
-			for x in Utils.listdir(path):
-				if x.endswith(self.env.cxxshlib_PATTERN % ''):
-					has_dlls = True
-					break
-			if not has_dlls:
-				self.env['STLIBPATH_%s' % var] = [path]
-				self.env['STLIB_%s' % var] = libs
-				del self.env['LIB_%s' % var]
-				del self.env['LIBPATH_%s' % var]
-
-			# we attempt to play with some known-to-work CXXFLAGS combinations
-			for cxxflags in (['/MD', '/EHsc'], []):
-				self.env.stash()
-				self.env["CXXFLAGS_%s" % var] += cxxflags
-				try:
-					try_link()
-					self.end_msg("ok: winning cxxflags combination: %s" % (self.env["CXXFLAGS_%s" % var]))
-					e = None
-					break
-				except Errors.ConfigurationError, exc:
-					self.env.revert()
-					e = exc
-
-			if e is not None:
-				self.fatal("Could not auto-detect boost linking flags combination, you may report it to boost.py author", ex=e)
-		else:
-			self.fatal("Boost linkage flags auto-detection not implemented (needed ?) for this toolchain")
-	else:
-		self.start_msg('Checking for boost linkage')
-		try:
-			try_link()
-		except Errors.ConfigurationError, e:
-			self.fatal("Could not link against boost libraries using supplied options")
-		self.end_msg('ok')
-
+#!/usr/bin/env python
+# encoding: utf-8
+#
+# partially based on boost.py written by Gernot Vormayr
+# written by Ruediger Sonderfeld <ruediger@c-plusplus.de>, 2008
+# modified by Bjoern Michaelsen, 2008
+# modified by Luca Fossati, 2008
+# rewritten for waf 1.5.1, Thomas Nagy, 2008
+# rewritten for waf 1.6.2, Sylvain Rouquette, 2011
+
+'''
+
+This is an extra tool, not bundled with the default waf binary.
+To add the boost tool to the waf file:
+$ ./waf-light --tools=compat15,boost
+	or, if you have waf >= 1.6.2
+$ ./waf update --files=boost
+
+When using this tool, the wscript will look like:
+
+	def options(opt):
+		opt.load('compiler_cxx boost')
+
+	def configure(conf):
+		conf.load('compiler_cxx boost')
+		conf.check_boost(lib='system filesystem')
+
+	def build(bld):
+		bld(source='main.cpp', target='app', use='BOOST')
+
+Options are generated, in order to specify the location of boost includes/libraries.
+The `check_boost` configuration function allows to specify the used boost libraries.
+It can also provide default arguments to the --boost-static and --boost-mt command-line arguments.
+Everything will be packaged together in a BOOST component that you can use.
+
+When using MSVC, a lot of compilation flags need to match your BOOST build configuration:
+ - you may have to add /EHsc to your CXXFLAGS or define boost::throw_exception if BOOST_NO_EXCEPTIONS is defined.
+   Errors: C4530
+ - boost libraries will try to be smart and use the (pretty but often not useful) auto-linking feature of MSVC
+   So before calling `conf.check_boost` you might want to disabling by adding:
+   	conf.env.DEFINES_BOOST += ['BOOST_ALL_NO_LIB']
+   Errors: 
+ - boost might also be compiled with /MT, which links the runtime statically.
+   If you have problems with redefined symbols, 
+		self.env['DEFINES_%s' % var] += ['BOOST_ALL_NO_LIB']
+		self.env['CXXFLAGS_%s' % var] += ['/MD', '/EHsc']
+Passing `--boost-linkage_autodetect` might help ensuring having a correct linkage in some basic cases.
+
+'''
+
+import sys
+import re
+from waflib import Utils, Logs, Errors
+from waflib.Configure import conf
+
+BOOST_LIBS = ['/usr/lib/x86_64-linux-gnu', '/usr/lib/i386-linux-gnu',
+	      '/usr/lib', '/usr/local/lib', '/opt/local/lib', '/sw/lib', '/lib']
+BOOST_INCLUDES = ['/usr/include', '/usr/local/include', '/opt/local/include', '/sw/include']
+BOOST_VERSION_FILE = 'boost/version.hpp'
+BOOST_VERSION_CODE = '''
+#include <iostream>
+#include <boost/version.hpp>
+int main() { std::cout << BOOST_LIB_VERSION << std::endl; }
+'''
+
+BOOST_ERROR_CODE = '''
+#include <boost/system/error_code.hpp>
+int main() { boost::system::error_code c; }
+'''
+
+BOOST_THREAD_CODE = '''
+#include <boost/thread.hpp>
+int main() { boost::thread t; }
+'''
+
+# toolsets from {boost_dir}/tools/build/v2/tools/common.jam
+PLATFORM = Utils.unversioned_sys_platform()
+detect_intel = lambda env: (PLATFORM == 'win32') and 'iw' or 'il'
+detect_clang = lambda env: (PLATFORM == 'darwin') and 'clang-darwin' or 'clang'
+detect_mingw = lambda env: (re.search('MinGW', env.CXX[0])) and 'mgw' or 'gcc'
+BOOST_TOOLSETS = {
+	'borland':  'bcb',
+	'clang':	detect_clang,
+	'como':	 'como',
+	'cw':	   'cw',
+	'darwin':   'xgcc',
+	'edg':	  'edg',
+	'g++':	  detect_mingw,
+	'gcc':	  detect_mingw,
+	'icpc':	 detect_intel,
+	'intel':	detect_intel,
+	'kcc':	  'kcc',
+	'kylix':	'bck',
+	'mipspro':  'mp',
+	'mingw':	'mgw',
+	'msvc':	 'vc',
+	'qcc':	  'qcc',
+	'sun':	  'sw',
+	'sunc++':   'sw',
+	'tru64cxx': 'tru',
+	'vacpp':	'xlc'
+}
+
+
+def options(opt):
+	opt.add_option('--boost-includes', type='string',
+				   default='', dest='boost_includes',
+				   help='''path to the boost includes root (~boost root)
+				   e.g. /path/to/boost_1_47_0''')
+	opt.add_option('--boost-libs', type='string',
+				   default='', dest='boost_libs',
+				   help='''path to the directory where the boost libs are
+				   e.g. /path/to/boost_1_47_0/stage/lib''')
+	opt.add_option('--boost-static', action='store_true',
+				   default=False, dest='boost_static',
+				   help='link with static boost libraries (.lib/.a)')
+	opt.add_option('--boost-mt', action='store_true',
+				   default=False, dest='boost_mt',
+				   help='select multi-threaded libraries')
+	opt.add_option('--boost-abi', type='string', default='', dest='boost_abi',
+				   help='''select libraries with tags (dgsyp, d for debug),
+				   see doc Boost, Getting Started, chapter 6.1''')
+	opt.add_option('--boost-linkage_autodetect', action="store_true", dest='boost_linkage_autodetect',
+				   help="auto-detect boost linkage options (don't get used to it / might break other stuff)")
+	opt.add_option('--boost-toolset', type='string',
+				   default='', dest='boost_toolset',
+				   help='force a toolset e.g. msvc, vc90, \
+						gcc, mingw, mgw45 (default: auto)')
+	py_version = '%d%d' % (sys.version_info[0], sys.version_info[1])
+	opt.add_option('--boost-python', type='string',
+				   default=py_version, dest='boost_python',
+				   help='select the lib python with this version \
+						(default: %s)' % py_version)
+
+
+@conf
+def __boost_get_version_file(self, d):
+	dnode = self.root.find_dir(d)
+	if dnode:
+		return dnode.find_node(BOOST_VERSION_FILE)
+	return None
+
+@conf
+def boost_get_version(self, d):
+	"""silently retrieve the boost version number"""
+	node = self.__boost_get_version_file(d)
+	if node:
+		try:
+			txt = node.read()
+		except (OSError, IOError):
+			Logs.error("Could not read the file %r" % node.abspath())
+		else:
+			re_but = re.compile('^#define\\s+BOOST_LIB_VERSION\\s+"(.*)"', re.M)
+			m = re_but.search(txt)
+			if m:
+				return m.group(1)
+	return self.check_cxx(fragment=BOOST_VERSION_CODE, includes=[d], execute=True, define_ret=True)
+
+@conf
+def boost_get_includes(self, *k, **kw):
+	includes = k and k[0] or kw.get('includes', None)
+	if includes and self.__boost_get_version_file(includes):
+		return includes
+	for d in Utils.to_list(self.environ.get('INCLUDE', '')) + BOOST_INCLUDES:
+		if self.__boost_get_version_file(d):
+			return d
+	if includes:
+		self.end_msg('headers not found in %s' % includes)
+		self.fatal('The configuration failed')
+	else:
+		self.end_msg('headers not found, please provide a --boost-includes argument (see help)')
+		self.fatal('The configuration failed')
+
+
+@conf
+def boost_get_toolset(self, cc):
+	toolset = cc
+	if not cc:
+		build_platform = Utils.unversioned_sys_platform()
+		if build_platform in BOOST_TOOLSETS:
+			cc = build_platform
+		else:
+			cc = self.env.CXX_NAME
+	if cc in BOOST_TOOLSETS:
+		toolset = BOOST_TOOLSETS[cc]
+	return isinstance(toolset, str) and toolset or toolset(self.env)
+
+
+@conf
+def __boost_get_libs_path(self, *k, **kw):
+	''' return the lib path and all the files in it '''
+	if 'files' in kw:
+		return self.root.find_dir('.'), Utils.to_list(kw['files'])
+	libs = k and k[0] or kw.get('libs', None)
+	if libs:
+		path = self.root.find_dir(libs)
+		files = path.ant_glob('*boost_*')
+	if not libs or not files:
+		for d in Utils.to_list(self.environ.get('LIB', [])) + BOOST_LIBS:
+			path = self.root.find_dir(d)
+			if path:
+				files = path.ant_glob('*boost_*')
+				if files:
+					break
+			path = self.root.find_dir(d + '64')
+			if path:
+				files = path.ant_glob('*boost_*')
+				if files:
+					break
+	if not path:
+		if libs:
+			self.end_msg('libs not found in %s' % libs)
+			self.fatal('The configuration failed')
+		else:
+			self.end_msg('libs not found, please provide a --boost-libs argument (see help)')
+			self.fatal('The configuration failed')
+
+	self.to_log('Found the boost path in %r with the libraries:' % path)
+	for x in files:
+		self.to_log('    %r' % x)
+	return path, files
+
+@conf
+def boost_get_libs(self, *k, **kw):
+	'''
+	return the lib path and the required libs
+	according to the parameters
+	'''
+	path, files = self.__boost_get_libs_path(**kw)
+	t = []
+	if kw.get('mt', False):
+		t.append('mt')
+	if kw.get('abi', None):
+		t.append(kw['abi'])
+	tags = t and '(-%s)+' % '-'.join(t) or ''
+	toolset = self.boost_get_toolset(kw.get('toolset', ''))
+	toolset_pat = '(-%s[0-9]{0,3})+' % toolset
+	version = '(-%s)+' % self.env.BOOST_VERSION
+
+	def find_lib(re_lib, files):
+		for file in files:
+			if re_lib.search(file.name):
+				self.to_log('Found boost lib %s' % file)
+				return file
+		return None
+
+	def format_lib_name(name):
+		if name.startswith('lib') and self.env.CC_NAME != 'msvc':
+			name = name[3:]
+		return name[:name.rfind('.')]
+
+	libs = []
+	for lib in Utils.to_list(k and k[0] or kw.get('lib', None)):
+		py = (lib == 'python') and '(-py%s)+' % kw['python'] or ''
+		# Trying libraries, from most strict match to least one
+		for pattern in ['boost_%s%s%s%s%s' % (lib, toolset_pat, tags, py, version),
+						'boost_%s%s%s%s' % (lib, tags, py, version),
+						'boost_%s%s%s' % (lib, tags, version),
+						# Give up trying to find the right version
+						'boost_%s%s%s%s' % (lib, toolset_pat, tags, py),
+						'boost_%s%s%s' % (lib, tags, py),
+						'boost_%s%s' % (lib, tags)]:
+			self.to_log('Trying pattern %s' % pattern)
+			file = find_lib(re.compile(pattern), files)
+			if file:
+				libs.append(format_lib_name(file.name))
+				break
+		else:
+			self.end_msg('lib %s not found in %s' % (lib, path.abspath()))
+			self.fatal('The configuration failed')
+
+	return path.abspath(), libs
+
+
+@conf
+def check_boost(self, *k, **kw):
+	"""
+	Initialize boost libraries to be used.
+
+	Keywords: you can pass the same parameters as with the command line (without "--boost-").
+	Note that the command line has the priority, and should preferably be used.
+	"""
+	if not self.env['CXX']:
+		self.fatal('load a c++ compiler first, conf.load("compiler_cxx")')
+
+	params = {'lib': k and k[0] or kw.get('lib', None)}
+	for key, value in self.options.__dict__.items():
+		if not key.startswith('boost_'):
+			continue
+		key = key[len('boost_'):]
+		params[key] = value and value or kw.get(key, '')
+
+	var = kw.get('uselib_store', 'BOOST')
+
+	self.start_msg('Checking boost includes')
+        try:
+                self.env['INCLUDES_%s' % var] = inc = self.boost_get_includes(**params)
+                self.env.BOOST_VERSION = self.boost_get_version(inc)
+        except Errors.WafError:
+                self.end_msg("not found", 'YELLOW')
+                raise
+        #self.env['INCLUDES_%s' % var] = inc = self.boost_get_includes(**params)
+        #self.env.BOOST_VERSION = self.boost_get_version(inc)
+	self.end_msg(self.env.BOOST_VERSION)
+	if Logs.verbose:
+		Logs.pprint('CYAN', '	path : %s' % self.env['INCLUDES_%s' % var])
+
+	if not params['lib']:
+		return
+	self.start_msg('Checking boost libs')
+        try:
+                suffix = params.get('static', None) and 'ST' or ''
+                path, libs = self.boost_get_libs(**params)
+        except Errors.WafError:
+                self.end_msg("not found", 'YELLOW')
+                raise
+        #suffix = params.get('static', None) and 'ST' or ''
+        #path, libs = self.boost_get_libs(**params)
+	self.env['%sLIBPATH_%s' % (suffix, var)] = [path]
+	self.env['%sLIB_%s' % (suffix, var)] = libs
+	self.end_msg('ok')
+	if Logs.verbose:
+		Logs.pprint('CYAN', '	path : %s' % path)
+		Logs.pprint('CYAN', '	libs : %s' % libs)
+
+
+	def try_link():
+		if 'system' in params['lib']:
+			self.check_cxx(fragment=BOOST_ERROR_CODE, use=var, execute=False)
+		if 'thread' in params['lib']:
+			self.check_cxx(fragment=BOOST_THREAD_CODE, use=var, execute=False)
+
+	if params.get('linkage_autodetect', False):
+		self.start_msg("Attempting to detect boost linkage flags")
+		toolset = self.boost_get_toolset(kw.get('toolset', ''))
+		if toolset in ['vc']:
+			# disable auto-linking feature, causing error LNK1181
+			# because the code wants to be linked against
+			self.env['DEFINES_%s' % var] += ['BOOST_ALL_NO_LIB']
+
+			# if no dlls are present, we guess the .lib files are not stubs
+			has_dlls = False
+			for x in Utils.listdir(path):
+				if x.endswith(self.env.cxxshlib_PATTERN % ''):
+					has_dlls = True
+					break
+			if not has_dlls:
+				self.env['STLIBPATH_%s' % var] = [path]
+				self.env['STLIB_%s' % var] = libs
+				del self.env['LIB_%s' % var]
+				del self.env['LIBPATH_%s' % var]
+
+			# we attempt to play with some known-to-work CXXFLAGS combinations
+			for cxxflags in (['/MD', '/EHsc'], []):
+				self.env.stash()
+				self.env["CXXFLAGS_%s" % var] += cxxflags
+				try:
+					try_link()
+					self.end_msg("ok: winning cxxflags combination: %s" % (self.env["CXXFLAGS_%s" % var]))
+					exc = None
+					break
+				except Errors.ConfigurationError as e:
+					self.env.revert()
+					exc = e
+
+			if exc is not None:
+				self.end_msg("Could not auto-detect boost linking flags combination, you may report it to boost.py author", ex=exc)
+				self.fatal('The configuration failed')
+		else:
+			self.end_msg("Boost linkage flags auto-detection not implemented (needed ?) for this toolchain")
+			self.fatal('The configuration failed')
+	else:
+		self.start_msg('Checking for boost linkage')
+		try:
+			try_link()
+		except Errors.ConfigurationError as e:
+			self.end_msg("Could not link against boost libraries using supplied options")
+			self.fatal('The configuration failed')
+		self.end_msg('ok')
+
diff -Naur ns-3.22/wscript ns-3.23/wscript
--- ns-3.22/wscript	2015-02-05 15:46:23.000000000 -0800
+++ ns-3.23/wscript	2015-05-13 11:05:27.000000000 -0700
@@ -536,7 +536,7 @@
                              Options.options.build_profile, Logs.colors('NORMAL'))
     bld = wutils.bld
     print "%-30s: %s%s%s" % ("Build directory", Logs.colors('GREEN'),
-                             Context.out_dir, Logs.colors('NORMAL'))
+                             Options.options.out, Logs.colors('NORMAL'))
     
     
     for (name, caption, was_enabled, reason_not_enabled) in conf.env['NS3_OPTIONAL_FEATURES']: